diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000..ae831c5 Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index cc72de3..99202cc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,11 +5,12 @@ @@ -24,26 +25,10 @@ - + - - - - - 1.8 - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index b1cb313..9c86e17 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,9 +2,8 @@ - - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index a2ab108..b44709c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,9 +2,9 @@ apply plugin: 'com.android.application' android { compileSdkVersion 26 - buildToolsVersion "26.0.2" + buildToolsVersion '27.0.3' defaultConfig { - applicationId "ch.pizzalink.android" + applicationId "ch.pizzapp.android" minSdkVersion 16 targetSdkVersion 26 versionCode 6 // play store'daki version : 5 @@ -20,34 +20,34 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:26.0.1' - compile 'com.android.support.constraint:constraint-layout:1.0.2' - compile 'com.android.support:recyclerview-v7:26.0.1' - compile 'com.android.support:cardview-v7:26.0.1' - compile 'com.google.android.gms:play-services-maps:11.0.4' - compile 'com.google.android.gms:play-services-location:11.0.4' - compile 'com.squareup.picasso:picasso:2.5.2' - compile 'com.squareup.retrofit2:retrofit:2.1.0' - compile 'com.squareup.retrofit2:converter-gson:2.0.0' - compile 'com.squareup.okhttp3:okhttp:3.5.0' - compile 'uk.co.chrisjenx:calligraphy:2.2.0' - compile 'com.jakewharton:butterknife:8.5.1' - compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0' - compile 'com.wdullaer:materialdatetimepicker:3.1.1' - compile 'com.github.ittianyu:BottomNavigationViewEx:1.1.3' - compile 'com.github.bumptech.glide:glide:3.7.0' - compile 'io.nlopez.smartlocation:library:3.3.1' - compile 'com.afollestad.material-dialogs:core:0.9.4.5' - compile 'com.github.AndroidDeveloperLB:DialogShard:3' - compile 'com.github.HITGIF:TextFieldBoxes:1.3.3' - compile 'io.github.luizgrp.sectionedrecyclerviewadapter:sectionedrecyclerviewadapter:1.1.3' - compile 'com.squareup.okhttp3:logging-interceptor:3.9.0' - compile 'com.github.badoualy:stepper-indicator:1.0.7' - compile 'q.rorbin:badgeview:1.1.0' - testCompile 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:26.0.1' + implementation 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'com.android.support:recyclerview-v7:26.0.1' + implementation 'com.android.support:cardview-v7:26.0.1' + implementation 'com.google.android.gms:play-services-maps:11.0.4' + implementation 'com.google.android.gms:play-services-location:11.0.4' + implementation 'com.squareup.picasso:picasso:2.5.2' + implementation 'com.squareup.retrofit2:retrofit:2.1.0' + implementation 'com.squareup.retrofit2:converter-gson:2.0.0' + implementation 'com.squareup.okhttp3:okhttp:3.5.0' + implementation 'uk.co.chrisjenx:calligraphy:2.2.0' + implementation 'com.jakewharton:butterknife:8.5.1' + implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0' + implementation 'com.wdullaer:materialdatetimepicker:3.1.1' + implementation 'com.github.ittianyu:BottomNavigationViewEx:1.1.3' + implementation 'com.github.bumptech.glide:glide:3.7.0' + implementation 'io.nlopez.smartlocation:library:3.3.1' + implementation 'com.afollestad.material-dialogs:core:0.9.4.5' + implementation 'com.github.AndroidDeveloperLB:DialogShard:3' + implementation 'com.github.HITGIF:TextFieldBoxes:1.3.3' + implementation 'io.github.luizgrp.sectionedrecyclerviewadapter:sectionedrecyclerviewadapter:1.1.3' + implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0' + implementation 'com.github.badoualy:stepper-indicator:1.0.7' + implementation 'q.rorbin:badgeview:1.1.0' + testImplementation 'junit:junit:4.12' annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1' } diff --git a/app/src/androidTest/java/ch/pizzalink/android/ExampleInstrumentedTest.java b/app/src/androidTest/java/ch/pizzapp/android/ExampleInstrumentedTest.java similarity index 95% rename from app/src/androidTest/java/ch/pizzalink/android/ExampleInstrumentedTest.java rename to app/src/androidTest/java/ch/pizzapp/android/ExampleInstrumentedTest.java index c726d28..2bebff6 100644 --- a/app/src/androidTest/java/ch/pizzalink/android/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/ch/pizzapp/android/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android; +package ch.pizzapp.android; import android.content.Context; import android.support.test.InstrumentationRegistry; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c46f14a..a6ac899 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,12 +1,12 @@ + package="ch.pizzapp.android"> getAddNewAddressRequestParams(){ HashMap params = new HashMap<>(); - params.put("address_1", address1PizzalinkEditText.getText()); + params.put("address_1", address1AppEditText.getText()); params.put("address_2", ""); params.put("city", selectedCityModel.getCity()); //params.put("postcode", selectedCityModel.getPostcode()); - params.put("postcode", postcodePizzalinkEditText.getText()); + params.put("postcode", postcodeAppEditText.getText()); //params.put("country_id", selectedCountryModel.getId()); //params.put("zone_id", selectedZoneModel.getZoneId()); params.put("country_id", "1"); diff --git a/app/src/main/java/ch/pizzalink/android/activity/BaseActivity.java b/app/src/main/java/ch/pizzapp/android/activity/BaseActivity.java similarity index 96% rename from app/src/main/java/ch/pizzalink/android/activity/BaseActivity.java rename to app/src/main/java/ch/pizzapp/android/activity/BaseActivity.java index 1301b25..843bb72 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/BaseActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/BaseActivity.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.activity; +package ch.pizzapp.android.activity; import android.content.Context; import android.os.Bundle; diff --git a/app/src/main/java/ch/pizzalink/android/activity/CreateOrderActivity.java b/app/src/main/java/ch/pizzapp/android/activity/CreateOrderActivity.java similarity index 89% rename from app/src/main/java/ch/pizzalink/android/activity/CreateOrderActivity.java rename to app/src/main/java/ch/pizzapp/android/activity/CreateOrderActivity.java index ca7f653..8d34a96 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/CreateOrderActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/CreateOrderActivity.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.activity; +package ch.pizzapp.android.activity; import android.content.Intent; import android.os.Bundle; @@ -8,18 +8,18 @@ import com.badoualy.stepperindicator.StepperIndicator; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzalink.android.R; -import ch.pizzalink.android.fragment.createOrder.CreateOrderNoteFragment; -import ch.pizzalink.android.fragment.createOrder.CreateOrderResultFragment; -import ch.pizzalink.android.fragment.createOrder.CreateOrderSummaryFragment; -import ch.pizzalink.android.fragment.createOrder.PaymentMethodFragment; -import ch.pizzalink.android.fragment.createOrder.ShippingAddressFragment; -import ch.pizzalink.android.fragment.createOrder.ShippingMethodFragment; -import ch.pizzalink.android.helper.SharedPrefsHelper; -import ch.pizzalink.android.model.AddressModel; -import ch.pizzalink.android.model.PaymentMethodModel; -import ch.pizzalink.android.model.ShippingMethodModel; -import ch.pizzalink.android.model.cart.CartInfoModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.fragment.createOrder.CreateOrderNoteFragment; +import ch.pizzapp.android.fragment.createOrder.CreateOrderResultFragment; +import ch.pizzapp.android.fragment.createOrder.CreateOrderSummaryFragment; +import ch.pizzapp.android.fragment.createOrder.PaymentMethodFragment; +import ch.pizzapp.android.fragment.createOrder.ShippingAddressFragment; +import ch.pizzapp.android.fragment.createOrder.ShippingMethodFragment; +import ch.pizzapp.android.helper.SharedPrefsHelper; +import ch.pizzapp.android.model.AddressModel; +import ch.pizzapp.android.model.PaymentMethodModel; +import ch.pizzapp.android.model.ShippingMethodModel; +import ch.pizzapp.android.model.cart.CartInfoModel; public class CreateOrderActivity extends BaseActivity { diff --git a/app/src/main/java/ch/pizzalink/android/activity/ForgotPasswordActivity.java b/app/src/main/java/ch/pizzapp/android/activity/ForgotPasswordActivity.java similarity index 78% rename from app/src/main/java/ch/pizzalink/android/activity/ForgotPasswordActivity.java rename to app/src/main/java/ch/pizzapp/android/activity/ForgotPasswordActivity.java index 04d016e..11c0102 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/ForgotPasswordActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/ForgotPasswordActivity.java @@ -1,10 +1,8 @@ -package ch.pizzalink.android.activity; +package ch.pizzapp.android.activity; import android.content.Intent; import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; -import android.view.View; import android.widget.Button; import com.afollestad.materialdialogs.DialogAction; @@ -14,21 +12,21 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzalink.android.R; -import ch.pizzalink.android.api.ApiErrorUtils; -import ch.pizzalink.android.api.ApiService; -import ch.pizzalink.android.api.ResponseObject; -import ch.pizzalink.android.helper.DialogHelper; -import ch.pizzalink.android.helper.ViewHelper; -import ch.pizzalink.android.view.PizzalinkEditText; -import ch.pizzalink.android.view.PizzalinkToolbar; +import ch.pizzapp.android.R; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseObject; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.ViewHelper; +import ch.pizzapp.android.view.AppEditText; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; public class ForgotPasswordActivity extends BaseActivity { - @BindView(R.id.forgotPasswordEmailPizzalinkEditText) PizzalinkEditText forgotPasswordEmailPizzalinkEditText; + @BindView(R.id.forgotPasswordEmailPizzalinkEditText) + AppEditText forgotPasswordEmailAppEditText; @BindView(R.id.resetPasswordButton) Button resetPasswordButton; @BindString(R.string.alert_fill_all_fields) String fillAllFieldsText; @@ -52,12 +50,12 @@ public class ForgotPasswordActivity extends BaseActivity { private boolean checkFields(){ - if(forgotPasswordEmailPizzalinkEditText.isEmpty()){ + if(forgotPasswordEmailAppEditText.isEmpty()){ DialogHelper.showAlertDialog(this, fillAllFieldsText); return false; } - if(!forgotPasswordEmailPizzalinkEditText.isEmail()){ + if(!forgotPasswordEmailAppEditText.isEmail()){ DialogHelper.showAlertDialog(this, validEmailText); return false; } @@ -68,7 +66,7 @@ public class ForgotPasswordActivity extends BaseActivity { private void resetPassword(){ DialogHelper.showLoadingDialog(); Call call = ApiService.apiInterface.forgotPassword( - forgotPasswordEmailPizzalinkEditText.getText()); + forgotPasswordEmailAppEditText.getText()); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { diff --git a/app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java b/app/src/main/java/ch/pizzapp/android/activity/LoginActivity.java similarity index 79% rename from app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java rename to app/src/main/java/ch/pizzapp/android/activity/LoginActivity.java index d4bf507..edd787f 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/LoginActivity.java @@ -1,12 +1,7 @@ -package ch.pizzalink.android.activity; +package ch.pizzapp.android.activity; import android.content.Intent; -import android.graphics.Color; 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.widget.Button; import android.widget.TextView; @@ -15,27 +10,29 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzalink.android.R; -import ch.pizzalink.android.api.ApiEndPoints; -import ch.pizzalink.android.api.ApiErrorUtils; -import ch.pizzalink.android.api.ApiService; -import ch.pizzalink.android.api.ResponseObject; -import ch.pizzalink.android.helper.DialogHelper; -import ch.pizzalink.android.helper.PriceHelper; -import ch.pizzalink.android.helper.SessionHelper; -import ch.pizzalink.android.helper.SharedPrefsHelper; -import ch.pizzalink.android.helper.ViewHelper; -import ch.pizzalink.android.model.UserModel; -import ch.pizzalink.android.model.cart.CartInfoModel; -import ch.pizzalink.android.view.PizzalinkEditText; +import ch.pizzapp.android.R; +import ch.pizzapp.android.api.ApiEndPoints; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseObject; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.PriceHelper; +import ch.pizzapp.android.helper.SessionHelper; +import ch.pizzapp.android.helper.SharedPrefsHelper; +import ch.pizzapp.android.helper.ViewHelper; +import ch.pizzapp.android.model.UserModel; +import ch.pizzapp.android.model.cart.CartInfoModel; +import ch.pizzapp.android.view.AppEditText; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; public class LoginActivity extends BaseActivity { - @BindView(R.id.emailPizzalinkEditText) PizzalinkEditText emailPizzalinkEditText; - @BindView(R.id.passwordPizzalinkEditText) PizzalinkEditText passwordPizzalinkEditText; + @BindView(R.id.emailPizzalinkEditText) + AppEditText emailAppEditText; + @BindView(R.id.passwordPizzalinkEditText) + AppEditText passwordAppEditText; @BindView(R.id.loginButton) Button loginButton; @BindView(R.id.forgotPasswordTextView) TextView forgotPasswordTextView; @@ -78,12 +75,12 @@ public class LoginActivity extends BaseActivity { private boolean checkFields(){ - if(emailPizzalinkEditText.isEmpty() || passwordPizzalinkEditText.isEmpty()){ + if(emailAppEditText.isEmpty() || passwordAppEditText.isEmpty()){ DialogHelper.showAlertDialog(this, fillAllFieldsText); return false; } - if(!emailPizzalinkEditText.isEmail()){ + if(!emailAppEditText.isEmail()){ DialogHelper.showAlertDialog(this, validEmailText); return false; } @@ -94,7 +91,7 @@ public class LoginActivity extends BaseActivity { private void login(){ DialogHelper.showLoadingDialog(); Call> call = ApiService.apiInterface.login( - emailPizzalinkEditText.getText(), passwordPizzalinkEditText.getText()); + emailAppEditText.getText(), passwordAppEditText.getText()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { diff --git a/app/src/main/java/ch/pizzalink/android/activity/MainActivity.java b/app/src/main/java/ch/pizzapp/android/activity/MainActivity.java similarity index 94% rename from app/src/main/java/ch/pizzalink/android/activity/MainActivity.java rename to app/src/main/java/ch/pizzapp/android/activity/MainActivity.java index 1c89986..2b1452d 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/MainActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/MainActivity.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.activity; +package ch.pizzapp.android.activity; import android.content.Intent; import android.graphics.drawable.Drawable; @@ -28,20 +28,20 @@ import butterknife.BindColor; import butterknife.BindDrawable; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzalink.android.R; -import ch.pizzalink.android.adapter.recycler.NavigationMenuRecyclerAdapter; -import ch.pizzalink.android.fragment.CartFragment; -import ch.pizzalink.android.fragment.OrderHistoryFragment; -import ch.pizzalink.android.fragment.StoreInfoFragment; -import ch.pizzalink.android.fragment.MenuFragment; -import ch.pizzalink.android.fragment.ProductFragment; -import ch.pizzalink.android.fragment.ProfileFragment; -import ch.pizzalink.android.helper.DialogHelper; -import ch.pizzalink.android.helper.PriceHelper; -import ch.pizzalink.android.helper.SessionHelper; -import ch.pizzalink.android.helper.SharedPrefsHelper; -import ch.pizzalink.android.model.CategoryModel; -import ch.pizzalink.android.view.PizzalinkToolbar; +import ch.pizzapp.android.R; +import ch.pizzapp.android.adapter.recycler.NavigationMenuRecyclerAdapter; +import ch.pizzapp.android.fragment.CartFragment; +import ch.pizzapp.android.fragment.OrderHistoryFragment; +import ch.pizzapp.android.fragment.StoreInfoFragment; +import ch.pizzapp.android.fragment.MenuFragment; +import ch.pizzapp.android.fragment.ProductFragment; +import ch.pizzapp.android.fragment.ProfileFragment; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.PriceHelper; +import ch.pizzapp.android.helper.SessionHelper; +import ch.pizzapp.android.helper.SharedPrefsHelper; +import ch.pizzapp.android.model.CategoryModel; +import ch.pizzapp.android.view.AppToolbar; import io.github.luizgrp.sectionedrecyclerviewadapter.SectionParameters; import io.github.luizgrp.sectionedrecyclerviewadapter.SectionedRecyclerViewAdapter; import io.github.luizgrp.sectionedrecyclerviewadapter.StatelessSection; @@ -50,7 +50,8 @@ public class MainActivity extends BaseActivity { @BindView(R.id.drawerLayout) DrawerLayout drawerLayout; @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.cartTotalTextView) TextView cartTotalTextView; @BindView(R.id.bottomNavigationView) BottomNavigationViewEx bottomNavigationView; @@ -268,7 +269,7 @@ public class MainActivity extends BaseActivity { initNavigationMenuRecyclerView(); - pizzalinkToolbar.getHamburgerIcon().setOnClickListener(new View.OnClickListener() { + appToolbar.getHamburgerIcon().setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { if(drawerLayout.isDrawerOpen(GravityCompat.START)) @@ -284,8 +285,8 @@ public class MainActivity extends BaseActivity { } public void setPizzalinkToolbarFields(boolean showHamburgerIcon, String title){ - pizzalinkToolbar.setHamburgerIconVisibility(showHamburgerIcon); - pizzalinkToolbar.setTitle(title); + appToolbar.setHamburgerIconVisibility(showHamburgerIcon); + appToolbar.setTitle(title); if(showHamburgerIcon) drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED); else diff --git a/app/src/main/java/ch/pizzalink/android/activity/MyAddressesActivity.java b/app/src/main/java/ch/pizzapp/android/activity/MyAddressesActivity.java similarity index 89% rename from app/src/main/java/ch/pizzalink/android/activity/MyAddressesActivity.java rename to app/src/main/java/ch/pizzapp/android/activity/MyAddressesActivity.java index 7ea2b6c..579d403 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/MyAddressesActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/MyAddressesActivity.java @@ -1,8 +1,7 @@ -package ch.pizzalink.android.activity; +package ch.pizzapp.android.activity; import android.content.Intent; import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -18,19 +17,18 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzalink.android.R; -import ch.pizzalink.android.adapter.recycler.MyAddressesRecyclerAdapter; -import ch.pizzalink.android.api.ApiEndPoints; -import ch.pizzalink.android.api.ApiErrorUtils; -import ch.pizzalink.android.api.ApiService; -import ch.pizzalink.android.api.ResponseArray; -import ch.pizzalink.android.api.ResponseObject; -import ch.pizzalink.android.helper.DialogHelper; -import ch.pizzalink.android.helper.SessionHelper; -import ch.pizzalink.android.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.AddressModel; -import ch.pizzalink.android.model.DeleteAddressResponseModel; -import ch.pizzalink.android.view.PizzalinkToolbar; +import ch.pizzapp.android.R; +import ch.pizzapp.android.adapter.recycler.MyAddressesRecyclerAdapter; +import ch.pizzapp.android.api.ApiEndPoints; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseArray; +import ch.pizzapp.android.api.ResponseObject; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.SessionHelper; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.AddressModel; +import ch.pizzapp.android.model.DeleteAddressResponseModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzalink/android/activity/OrderHistoryDetailsActivity.java b/app/src/main/java/ch/pizzapp/android/activity/OrderHistoryDetailsActivity.java similarity index 83% rename from app/src/main/java/ch/pizzalink/android/activity/OrderHistoryDetailsActivity.java rename to app/src/main/java/ch/pizzapp/android/activity/OrderHistoryDetailsActivity.java index e4711a0..8ff36bd 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/OrderHistoryDetailsActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/OrderHistoryDetailsActivity.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.activity; +package ch.pizzapp.android.activity; import android.os.Bundle; import android.view.View; @@ -8,35 +8,43 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzalink.android.R; -import ch.pizzalink.android.api.ApiEndPoints; -import ch.pizzalink.android.api.ApiErrorUtils; -import ch.pizzalink.android.api.ApiService; -import ch.pizzalink.android.api.ResponseArray; -import ch.pizzalink.android.helper.DialogHelper; -import ch.pizzalink.android.helper.PriceHelper; -import ch.pizzalink.android.helper.SessionHelper; -import ch.pizzalink.android.helper.TextHelper; -import ch.pizzalink.android.model.history.OrderHistoryModel; -import ch.pizzalink.android.model.history.OrderHistoryProductModel; -import ch.pizzalink.android.model.history.OrderHistoryProductOptionModel; -import ch.pizzalink.android.view.PizzalinkInfoView; +import ch.pizzapp.android.R; +import ch.pizzapp.android.api.ApiEndPoints; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseArray; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.PriceHelper; +import ch.pizzapp.android.helper.SessionHelper; +import ch.pizzapp.android.helper.TextHelper; +import ch.pizzapp.android.model.history.OrderHistoryModel; +import ch.pizzapp.android.model.history.OrderHistoryProductModel; +import ch.pizzapp.android.model.history.OrderHistoryProductOptionModel; +import ch.pizzapp.android.view.AppInfoView; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; 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.orderShippingTimePizzalinkInfoLayout) PizzalinkInfoView orderShippingTimePizzalinkInfoLayout; - @BindView(R.id.orderTotalPizzalinkInfoLayout) PizzalinkInfoView orderTotalPizzalinkInfoLayout; - @BindView(R.id.orderPaymentMethodPizzalinkInfoLayout) PizzalinkInfoView orderPaymentMethodPizzalinkInfoLayout; + @BindView(R.id.orderShippingTimePizzalinkInfoLayout) + AppInfoView orderShippingTimePizzalinkInfoLayout; + @BindView(R.id.orderTotalPizzalinkInfoLayout) + AppInfoView orderTotalPizzalinkInfoLayout; + @BindView(R.id.orderPaymentMethodPizzalinkInfoLayout) + AppInfoView orderPaymentMethodPizzalinkInfoLayout; @BindView(R.id.orderProductsTextView) TextView orderProductsTextView; - @BindView(R.id.orderFullnamePizzalinkInfoLayout) PizzalinkInfoView orderFullnamePizzalinkInfoLayout; - @BindView(R.id.orderShippingMethodPizzalinkInfoLayout) PizzalinkInfoView orderShippingMethodPizzalinkInfoLayout; - @BindView(R.id.orderShippingAddressPizzalinkInfoLayout) PizzalinkInfoView orderShippingAddressPizzalinkInfoLayout; - @BindView(R.id.orderNotePizzalinkInfoLayout) PizzalinkInfoView orderNotePizzalinkInfoLayout; + @BindView(R.id.orderFullnamePizzalinkInfoLayout) + AppInfoView orderFullnamePizzalinkInfoLayout; + @BindView(R.id.orderShippingMethodPizzalinkInfoLayout) + AppInfoView orderShippingMethodPizzalinkInfoLayout; + @BindView(R.id.orderShippingAddressPizzalinkInfoLayout) + AppInfoView orderShippingAddressPizzalinkInfoLayout; + @BindView(R.id.orderNotePizzalinkInfoLayout) + AppInfoView orderNotePizzalinkInfoLayout; private OrderHistoryModel orderHistoryModel; private ArrayList productList = new ArrayList<>(); diff --git a/app/src/main/java/ch/pizzalink/android/activity/ProductPropertiesActivity.java b/app/src/main/java/ch/pizzapp/android/activity/ProductPropertiesActivity.java similarity index 93% rename from app/src/main/java/ch/pizzalink/android/activity/ProductPropertiesActivity.java rename to app/src/main/java/ch/pizzapp/android/activity/ProductPropertiesActivity.java index 0c6fa2a..d467f07 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/ProductPropertiesActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/ProductPropertiesActivity.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.activity; +package ch.pizzapp.android.activity; import android.support.design.widget.BottomSheetBehavior; import android.support.v7.app.AppCompatActivity; @@ -27,27 +27,27 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzalink.android.R; -import ch.pizzalink.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter; -import ch.pizzalink.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter; -import ch.pizzalink.android.api.ApiEndPoints; -import ch.pizzalink.android.api.ApiErrorUtils; -import ch.pizzalink.android.api.ApiService; -import ch.pizzalink.android.api.ResponseObject; -import ch.pizzalink.android.helper.DialogHelper; -import ch.pizzalink.android.helper.ImageLoadHelper; -import ch.pizzalink.android.helper.PriceHelper; -import ch.pizzalink.android.helper.SessionHelper; -import ch.pizzalink.android.helper.SharedPrefsHelper; -import ch.pizzalink.android.helper.TextHelper; -import ch.pizzalink.android.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.AddProductToBasketResponseModel; -import ch.pizzalink.android.model.AddToBasketOptionModel; -import ch.pizzalink.android.model.ZoneModel; -import ch.pizzalink.android.model.cart.CartInfoModel; -import ch.pizzalink.android.model.menu.MenuProductModel; -import ch.pizzalink.android.model.menu.MenuProductOptionModel; -import ch.pizzalink.android.model.menu.MenuProductOptionValueModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter; +import ch.pizzapp.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter; +import ch.pizzapp.android.api.ApiEndPoints; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseObject; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.ImageLoadHelper; +import ch.pizzapp.android.helper.PriceHelper; +import ch.pizzapp.android.helper.SessionHelper; +import ch.pizzapp.android.helper.SharedPrefsHelper; +import ch.pizzapp.android.helper.TextHelper; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.AddProductToBasketResponseModel; +import ch.pizzapp.android.model.AddToBasketOptionModel; +import ch.pizzapp.android.model.ZoneModel; +import ch.pizzapp.android.model.cart.CartInfoModel; +import ch.pizzapp.android.model.menu.MenuProductModel; +import ch.pizzapp.android.model.menu.MenuProductOptionModel; +import ch.pizzapp.android.model.menu.MenuProductOptionValueModel; import okhttp3.FormBody; import okhttp3.MediaType; import okhttp3.RequestBody; diff --git a/app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java b/app/src/main/java/ch/pizzapp/android/activity/RegisterActivity.java similarity index 83% rename from app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java rename to app/src/main/java/ch/pizzapp/android/activity/RegisterActivity.java index d7bb568..9610458 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/RegisterActivity.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.activity; +package ch.pizzapp.android.activity; import android.content.Intent; import android.os.Bundle; @@ -17,20 +17,20 @@ import butterknife.BindView; import butterknife.BindViews; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzalink.android.R; -import ch.pizzalink.android.api.ApiErrorUtils; -import ch.pizzalink.android.api.ApiService; -import ch.pizzalink.android.api.ResponseArray; -import ch.pizzalink.android.api.ResponseObject; -import ch.pizzalink.android.helper.DialogHelper; -import ch.pizzalink.android.helper.SharedPrefsHelper; -import ch.pizzalink.android.helper.ViewHelper; -import ch.pizzalink.android.model.CityModel; -import ch.pizzalink.android.model.CountryModel; -import ch.pizzalink.android.model.UserModel; -import ch.pizzalink.android.model.ZoneModel; -import ch.pizzalink.android.view.PizzalinkDropdownView; -import ch.pizzalink.android.view.PizzalinkEditText; +import ch.pizzapp.android.R; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseArray; +import ch.pizzapp.android.api.ResponseObject; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.SharedPrefsHelper; +import ch.pizzapp.android.helper.ViewHelper; +import ch.pizzapp.android.model.CityModel; +import ch.pizzapp.android.model.CountryModel; +import ch.pizzapp.android.model.UserModel; +import ch.pizzapp.android.model.ZoneModel; +import ch.pizzapp.android.view.AppDropdownView; +import ch.pizzapp.android.view.AppEditText; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -41,11 +41,14 @@ public class RegisterActivity extends BaseActivity { R.id.telephonePizzalinkEditText, R.id.emailPizzalinkEditText, R.id.passwordPizzalinkEditText, R.id.passwordAgainPizzalinkEditText, R.id.address1PizzalinkEditText, R.id.postcodePizzalinkEditText}) - List pizzalinkEditTextList; + List appEditTextList; - @BindView(R.id.cityPizzalinkDropdown) PizzalinkDropdownView cityPizzalinkDropdown; - @BindView(R.id.countryPizzalinkDropdown) PizzalinkDropdownView countryPizzalinkDropdown; - @BindView(R.id.zonePizzalinkDropdown) PizzalinkDropdownView zonePizzalinkDropdown; + @BindView(R.id.cityPizzalinkDropdown) + AppDropdownView cityPizzalinkDropdown; + @BindView(R.id.countryPizzalinkDropdown) + AppDropdownView countryPizzalinkDropdown; + @BindView(R.id.zonePizzalinkDropdown) + AppDropdownView zonePizzalinkDropdown; @BindView(R.id.registerButton) Button registerButton; @BindString(R.string.alert_fill_all_fields) String fillAllFieldsText; @@ -102,24 +105,24 @@ public class RegisterActivity extends BaseActivity { private boolean checkFields(){ - for(PizzalinkEditText pizzalinkEditText : pizzalinkEditTextList){ - if(pizzalinkEditText.isEmpty()){ + for(AppEditText appEditText : appEditTextList){ + if(appEditText.isEmpty()){ DialogHelper.showAlertDialog(this, fillAllFieldsText); return false; } } - if(!pizzalinkEditTextList.get(3).isEmail()){ + if(!appEditTextList.get(3).isEmail()){ DialogHelper.showAlertDialog(this, validEmailText); return false; } - if(!pizzalinkEditTextList + if(!appEditTextList .get(4) .getText() .toLowerCase() .equals( - pizzalinkEditTextList + appEditTextList .get(5) .getText() .toLowerCase())){ @@ -127,7 +130,7 @@ public class RegisterActivity extends BaseActivity { return false; } - if(pizzalinkEditTextList.get(7).getText().length() != 4){ + if(appEditTextList.get(7).getText().length() != 4){ DialogHelper.showAlertDialog(this, invalidPostcodeText); return false; } @@ -299,16 +302,16 @@ public class RegisterActivity extends BaseActivity { private HashMap getRegisterParams(){ HashMap params = new HashMap<>(); - params.put("firstname", pizzalinkEditTextList.get(0).getText()); - params.put("lastname", pizzalinkEditTextList.get(1).getText()); - params.put("telephone", pizzalinkEditTextList.get(2).getText()); - params.put("email", pizzalinkEditTextList.get(3).getText()); - params.put("password", pizzalinkEditTextList.get(4).getText()); - params.put("password1", pizzalinkEditTextList.get(5).getText()); - params.put("address_1", pizzalinkEditTextList.get(6).getText()); + params.put("firstname", appEditTextList.get(0).getText()); + params.put("lastname", appEditTextList.get(1).getText()); + params.put("telephone", appEditTextList.get(2).getText()); + params.put("email", appEditTextList.get(3).getText()); + params.put("password", appEditTextList.get(4).getText()); + params.put("password1", appEditTextList.get(5).getText()); + params.put("address_1", appEditTextList.get(6).getText()); params.put("address_2", ""); 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("zone_id", selectedZoneModel.getZoneId()); params.put("country_id", "1"); @@ -365,14 +368,14 @@ public class RegisterActivity extends BaseActivity { } private void setTestFields(){ - pizzalinkEditTextList.get(0).getEditText().setText("testname"); - pizzalinkEditTextList.get(1).getEditText().setText("testsurname"); - pizzalinkEditTextList.get(2).getEditText().setText("1234567892"); - pizzalinkEditTextList.get(3).getEditText().setText("test5@test.com"); - pizzalinkEditTextList.get(4).getEditText().setText("test"); - pizzalinkEditTextList.get(5).getEditText().setText("test"); - pizzalinkEditTextList.get(6).getEditText().setText("test address 1"); - pizzalinkEditTextList.get(7).getEditText().setText("test postcode"); + appEditTextList.get(0).getEditText().setText("testname"); + appEditTextList.get(1).getEditText().setText("testsurname"); + appEditTextList.get(2).getEditText().setText("1234567892"); + appEditTextList.get(3).getEditText().setText("test5@test.com"); + appEditTextList.get(4).getEditText().setText("test"); + appEditTextList.get(5).getEditText().setText("test"); + appEditTextList.get(6).getEditText().setText("test address 1"); + appEditTextList.get(7).getEditText().setText("test postcode"); } private synchronized void increaseActiveRequestCount(){ diff --git a/app/src/main/java/ch/pizzalink/android/activity/SplashActivity.java b/app/src/main/java/ch/pizzapp/android/activity/SplashActivity.java similarity index 91% rename from app/src/main/java/ch/pizzalink/android/activity/SplashActivity.java rename to app/src/main/java/ch/pizzapp/android/activity/SplashActivity.java index 41974ef..f674e93 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/SplashActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/SplashActivity.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.activity; +package ch.pizzapp.android.activity; import android.annotation.TargetApi; import android.content.Intent; @@ -16,22 +16,22 @@ import java.util.ArrayList; import java.util.HashMap; import butterknife.ButterKnife; -import ch.pizzalink.android.R; -import ch.pizzalink.android.api.ApiConstants; -import ch.pizzalink.android.api.ApiEndPoints; -import ch.pizzalink.android.api.ApiErrorUtils; -import ch.pizzalink.android.api.ApiService; -import ch.pizzalink.android.api.ResponseArray; -import ch.pizzalink.android.api.ResponseObject; -import ch.pizzalink.android.helper.DialogHelper; -import ch.pizzalink.android.helper.DisplayHelper; -import ch.pizzalink.android.helper.NetworkHelper; -import ch.pizzalink.android.helper.PriceHelper; -import ch.pizzalink.android.helper.SessionHelper; -import ch.pizzalink.android.helper.SharedPrefsHelper; -import ch.pizzalink.android.model.AppVersionModel; -import ch.pizzalink.android.model.CategoryModel; -import ch.pizzalink.android.model.cart.CartInfoModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.api.ApiConstants; +import ch.pizzapp.android.api.ApiEndPoints; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseArray; +import ch.pizzapp.android.api.ResponseObject; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.DisplayHelper; +import ch.pizzapp.android.helper.NetworkHelper; +import ch.pizzapp.android.helper.PriceHelper; +import ch.pizzapp.android.helper.SessionHelper; +import ch.pizzapp.android.helper.SharedPrefsHelper; +import ch.pizzapp.android.model.AppVersionModel; +import ch.pizzapp.android.model.CategoryModel; +import ch.pizzapp.android.model.cart.CartInfoModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzalink/android/activity/UpdatePasswordActivity.java b/app/src/main/java/ch/pizzapp/android/activity/UpdatePasswordActivity.java similarity index 65% rename from app/src/main/java/ch/pizzalink/android/activity/UpdatePasswordActivity.java rename to app/src/main/java/ch/pizzapp/android/activity/UpdatePasswordActivity.java index cf526a4..0dd1747 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/UpdatePasswordActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/UpdatePasswordActivity.java @@ -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.view.View; import android.widget.Button; import java.util.HashMap; @@ -11,25 +9,27 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzalink.android.R; -import ch.pizzalink.android.api.ApiEndPoints; -import ch.pizzalink.android.api.ApiErrorUtils; -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.ViewHelper; -import ch.pizzalink.android.view.PizzalinkEditText; -import ch.pizzalink.android.view.PizzalinkToolbar; +import ch.pizzapp.android.R; +import ch.pizzapp.android.api.ApiEndPoints; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseObject; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.SessionHelper; +import ch.pizzapp.android.helper.ViewHelper; +import ch.pizzapp.android.view.AppEditText; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; public class UpdatePasswordActivity extends BaseActivity { - @BindView(R.id.oldPasswordPizzalinkEditText) PizzalinkEditText oldPasswordPizzalinkEditText; - @BindView(R.id.newPasswordPizzalinkEditText) PizzalinkEditText newPasswordPizzalinkEditText; - @BindView(R.id.confirmNewPasswordPizzalinkEditText) PizzalinkEditText confirmNewPasswordPizzalinkEditText; + @BindView(R.id.oldPasswordPizzalinkEditText) + AppEditText oldPasswordAppEditText; + @BindView(R.id.newPasswordPizzalinkEditText) + AppEditText newPasswordAppEditText; + @BindView(R.id.confirmNewPasswordPizzalinkEditText) + AppEditText confirmNewPasswordAppEditText; @BindView(R.id.updatePasswordButton) Button updatePasswordButton; @BindString(R.string.alert_fill_all_fields) String fillAllFieldsText; @@ -52,14 +52,14 @@ public class UpdatePasswordActivity extends BaseActivity { private boolean checkFields(){ - if(oldPasswordPizzalinkEditText.isEmpty() || - newPasswordPizzalinkEditText.isEmail() || - confirmNewPasswordPizzalinkEditText.isEmpty()){ + if(oldPasswordAppEditText.isEmpty() || + newPasswordAppEditText.isEmail() || + confirmNewPasswordAppEditText.isEmpty()){ DialogHelper.showAlertDialog(BaseActivity.currentActivity, fillAllFieldsText); return false; } - if(!newPasswordPizzalinkEditText.getText().equals(confirmNewPasswordPizzalinkEditText.getText())){ + if(!newPasswordAppEditText.getText().equals(confirmNewPasswordAppEditText.getText())){ DialogHelper.showAlertDialog(BaseActivity.currentActivity, passwordsNotMatchedText); return false; } @@ -96,9 +96,9 @@ public class UpdatePasswordActivity extends BaseActivity { private HashMap getUpdatePasswordRequestParams(){ HashMap params = new HashMap<>(); - params.put("oldPassword", oldPasswordPizzalinkEditText.getText()); - params.put("password", newPasswordPizzalinkEditText.getText()); - params.put("confirm", confirmNewPasswordPizzalinkEditText.getText()); + params.put("oldPassword", oldPasswordAppEditText.getText()); + params.put("password", newPasswordAppEditText.getText()); + params.put("confirm", confirmNewPasswordAppEditText.getText()); return params; } } diff --git a/app/src/main/java/ch/pizzalink/android/activity/UpdateProfileActivity.java b/app/src/main/java/ch/pizzapp/android/activity/UpdateProfileActivity.java similarity index 66% rename from app/src/main/java/ch/pizzalink/android/activity/UpdateProfileActivity.java rename to app/src/main/java/ch/pizzapp/android/activity/UpdateProfileActivity.java index 8e1cf4a..f886e97 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/UpdateProfileActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/UpdateProfileActivity.java @@ -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.v7.app.AppCompatActivity; import android.os.Bundle; import android.widget.Button; @@ -15,25 +13,29 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzalink.android.R; -import ch.pizzalink.android.api.ApiEndPoints; -import ch.pizzalink.android.api.ApiErrorUtils; -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.model.UserModel; -import ch.pizzalink.android.view.PizzalinkEditText; +import ch.pizzapp.android.R; +import ch.pizzapp.android.api.ApiEndPoints; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseObject; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.SessionHelper; +import ch.pizzapp.android.model.UserModel; +import ch.pizzapp.android.view.AppEditText; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; public class UpdateProfileActivity extends BaseActivity { - @BindView(R.id.firstnamePizzalinkEditText) PizzalinkEditText firstnamePizzalinkEditText; - @BindView(R.id.lasstnamePizzalinkEditText) PizzalinkEditText lasstnamePizzalinkEditText; - @BindView(R.id.telephonePizzalinkEditText) PizzalinkEditText telephonePizzalinkEditText; - @BindView(R.id.emailPizzalinkEditText) PizzalinkEditText emailPizzalinkEditText; + @BindView(R.id.firstnamePizzalinkEditText) + AppEditText firstnameAppEditText; + @BindView(R.id.lasstnamePizzalinkEditText) + AppEditText lasstnameAppEditText; + @BindView(R.id.telephonePizzalinkEditText) + AppEditText telephoneAppEditText; + @BindView(R.id.emailPizzalinkEditText) + AppEditText emailAppEditText; @BindView(R.id.updateProfileButton) Button updateProfileButton; @BindString(R.string.alert_fill_all_fields) String fillAllFieldsText; @@ -62,10 +64,10 @@ public class UpdateProfileActivity extends BaseActivity { } private void setFields(){ - firstnamePizzalinkEditText.setText(userModel.getFirstname()); - lasstnamePizzalinkEditText.setText(userModel.getLastname()); - telephonePizzalinkEditText.setText(userModel.getTelephone()); - emailPizzalinkEditText.setText(userModel.getEmail()); + firstnameAppEditText.setText(userModel.getFirstname()); + lasstnameAppEditText.setText(userModel.getLastname()); + telephoneAppEditText.setText(userModel.getTelephone()); + emailAppEditText.setText(userModel.getEmail()); } private void updateProfile(){ @@ -104,24 +106,24 @@ public class UpdateProfileActivity extends BaseActivity { private HashMap getUpdateProfileParams(){ HashMap params = new HashMap<>(); - params.put("firstname", firstnamePizzalinkEditText.getText()); - params.put("lastname", lasstnamePizzalinkEditText.getText()); - params.put("email", emailPizzalinkEditText.getText()); - params.put("telephone", telephonePizzalinkEditText.getText()); + params.put("firstname", firstnameAppEditText.getText()); + params.put("lastname", lasstnameAppEditText.getText()); + params.put("email", emailAppEditText.getText()); + params.put("telephone", telephoneAppEditText.getText()); return params; } private boolean checkFields(){ - if(firstnamePizzalinkEditText.isEmpty() || - lasstnamePizzalinkEditText.isEmpty() || - telephonePizzalinkEditText.isEmpty() || - emailPizzalinkEditText.isEmpty()){ + if(firstnameAppEditText.isEmpty() || + lasstnameAppEditText.isEmpty() || + telephoneAppEditText.isEmpty() || + emailAppEditText.isEmpty()){ DialogHelper.showAlertDialog(BaseActivity.currentActivity, fillAllFieldsText); return false; } - if(!emailPizzalinkEditText.isEmail()){ + if(!emailAppEditText.isEmail()){ DialogHelper.showAlertDialog(BaseActivity.currentActivity, validEmailText); return false; } diff --git a/app/src/main/java/ch/pizzalink/android/adapter/pager/OrderPagerAdapter.java b/app/src/main/java/ch/pizzapp/android/adapter/pager/OrderPagerAdapter.java similarity index 74% rename from app/src/main/java/ch/pizzalink/android/adapter/pager/OrderPagerAdapter.java rename to app/src/main/java/ch/pizzapp/android/adapter/pager/OrderPagerAdapter.java index 7237203..b3f90fa 100644 --- a/app/src/main/java/ch/pizzalink/android/adapter/pager/OrderPagerAdapter.java +++ b/app/src/main/java/ch/pizzapp/android/adapter/pager/OrderPagerAdapter.java @@ -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.FragmentManager; import android.support.v4.app.FragmentPagerAdapter; -import ch.pizzalink.android.fragment.createOrder.CreateOrderResultFragment; -import ch.pizzalink.android.fragment.createOrder.CreateOrderSummaryFragment; -import ch.pizzalink.android.fragment.createOrder.PaymentMethodFragment; -import ch.pizzalink.android.fragment.createOrder.ShippingAddressFragment; -import ch.pizzalink.android.fragment.createOrder.ShippingMethodFragment; +import ch.pizzapp.android.fragment.createOrder.CreateOrderResultFragment; +import ch.pizzapp.android.fragment.createOrder.CreateOrderSummaryFragment; +import ch.pizzapp.android.fragment.createOrder.PaymentMethodFragment; +import ch.pizzapp.android.fragment.createOrder.ShippingAddressFragment; +import ch.pizzapp.android.fragment.createOrder.ShippingMethodFragment; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzalink/android/adapter/recycler/CartRecyclerAdapter.java b/app/src/main/java/ch/pizzapp/android/adapter/recycler/CartRecyclerAdapter.java similarity index 94% rename from app/src/main/java/ch/pizzalink/android/adapter/recycler/CartRecyclerAdapter.java rename to app/src/main/java/ch/pizzapp/android/adapter/recycler/CartRecyclerAdapter.java index 5e7a713..a2f411a 100644 --- a/app/src/main/java/ch/pizzalink/android/adapter/recycler/CartRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzapp/android/adapter/recycler/CartRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.adapter.recycler; +package ch.pizzapp.android.adapter.recycler; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -11,12 +11,12 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzalink.android.R; -import ch.pizzalink.android.helper.PriceHelper; -import ch.pizzalink.android.helper.TextHelper; -import ch.pizzalink.android.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.cart.CartProductModel; -import ch.pizzalink.android.model.cart.CartProductOptionModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.helper.PriceHelper; +import ch.pizzapp.android.helper.TextHelper; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.cart.CartProductModel; +import ch.pizzapp.android.model.cart.CartProductOptionModel; /** * Created by cimenmus on 05/10/2017. diff --git a/app/src/main/java/ch/pizzalink/android/adapter/recycler/MenuProductRecyclerAdapter.java b/app/src/main/java/ch/pizzapp/android/adapter/recycler/MenuProductRecyclerAdapter.java similarity index 93% rename from app/src/main/java/ch/pizzalink/android/adapter/recycler/MenuProductRecyclerAdapter.java rename to app/src/main/java/ch/pizzapp/android/adapter/recycler/MenuProductRecyclerAdapter.java index 51a0690..869c26c 100644 --- a/app/src/main/java/ch/pizzalink/android/adapter/recycler/MenuProductRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzapp/android/adapter/recycler/MenuProductRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.adapter.recycler; +package ch.pizzapp.android.adapter.recycler; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -12,12 +12,12 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzalink.android.R; -import ch.pizzalink.android.helper.ImageLoadHelper; -import ch.pizzalink.android.helper.PriceHelper; -import ch.pizzalink.android.helper.TextHelper; -import ch.pizzalink.android.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.menu.MenuProductModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.helper.ImageLoadHelper; +import ch.pizzapp.android.helper.PriceHelper; +import ch.pizzapp.android.helper.TextHelper; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.menu.MenuProductModel; /** * Created by cimenmus on 20/09/2017. diff --git a/app/src/main/java/ch/pizzalink/android/adapter/recycler/MyAddressesRecyclerAdapter.java b/app/src/main/java/ch/pizzapp/android/adapter/recycler/MyAddressesRecyclerAdapter.java similarity index 95% rename from app/src/main/java/ch/pizzalink/android/adapter/recycler/MyAddressesRecyclerAdapter.java rename to app/src/main/java/ch/pizzapp/android/adapter/recycler/MyAddressesRecyclerAdapter.java index f211527..13380e2 100644 --- a/app/src/main/java/ch/pizzalink/android/adapter/recycler/MyAddressesRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzapp/android/adapter/recycler/MyAddressesRecyclerAdapter.java @@ -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.RecyclerView; @@ -12,9 +12,9 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzalink.android.R; -import ch.pizzalink.android.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.AddressModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.AddressModel; /** * Created by cimenmus on 24.10.2017. diff --git a/app/src/main/java/ch/pizzalink/android/adapter/recycler/NavigationMenuRecyclerAdapter.java b/app/src/main/java/ch/pizzapp/android/adapter/recycler/NavigationMenuRecyclerAdapter.java similarity index 95% rename from app/src/main/java/ch/pizzalink/android/adapter/recycler/NavigationMenuRecyclerAdapter.java rename to app/src/main/java/ch/pizzapp/android/adapter/recycler/NavigationMenuRecyclerAdapter.java index 6a08f1a..f40794f 100644 --- a/app/src/main/java/ch/pizzalink/android/adapter/recycler/NavigationMenuRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzapp/android/adapter/recycler/NavigationMenuRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.adapter.recycler; +package ch.pizzapp.android.adapter.recycler; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -10,10 +10,10 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.CategoryModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.CategoryModel; /** * Created by cimenmus on 02/10/2017. diff --git a/app/src/main/java/ch/pizzalink/android/adapter/recycler/OrderHistoryRecyclerAdapter.java b/app/src/main/java/ch/pizzapp/android/adapter/recycler/OrderHistoryRecyclerAdapter.java similarity index 94% rename from app/src/main/java/ch/pizzalink/android/adapter/recycler/OrderHistoryRecyclerAdapter.java rename to app/src/main/java/ch/pizzapp/android/adapter/recycler/OrderHistoryRecyclerAdapter.java index ab96ef5..f8227ac 100644 --- a/app/src/main/java/ch/pizzalink/android/adapter/recycler/OrderHistoryRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzapp/android/adapter/recycler/OrderHistoryRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.adapter.recycler; +package ch.pizzapp.android.adapter.recycler; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -10,10 +10,10 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzalink.android.R; -import ch.pizzalink.android.helper.PriceHelper; -import ch.pizzalink.android.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.history.OrderHistoryModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.helper.PriceHelper; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.history.OrderHistoryModel; /** * Created by cimenmus on 04/10/2017. diff --git a/app/src/main/java/ch/pizzalink/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java b/app/src/main/java/ch/pizzapp/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java similarity index 95% rename from app/src/main/java/ch/pizzalink/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java rename to app/src/main/java/ch/pizzapp/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java index e3b0796..6e43b4a 100644 --- a/app/src/main/java/ch/pizzalink/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzapp/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java @@ -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.RecyclerView; @@ -11,9 +11,9 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzalink.android.R; -import ch.pizzalink.android.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.PaymentMethodModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.PaymentMethodModel; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzalink/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java b/app/src/main/java/ch/pizzapp/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java similarity index 89% rename from app/src/main/java/ch/pizzalink/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java rename to app/src/main/java/ch/pizzapp/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java index 9bc8af3..62e9653 100644 --- a/app/src/main/java/ch/pizzalink/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzapp/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java @@ -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.RecyclerView; @@ -11,11 +11,11 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.helper.PriceHelper; -import ch.pizzalink.android.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.menu.MenuProductOptionValueModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzapp.android.helper.PriceHelper; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.menu.MenuProductOptionValueModel; /** * Created by cimenmus on 08/10/2017. diff --git a/app/src/main/java/ch/pizzalink/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java b/app/src/main/java/ch/pizzapp/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java similarity index 89% rename from app/src/main/java/ch/pizzalink/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java rename to app/src/main/java/ch/pizzapp/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java index d2bbfa2..7c7ca71 100644 --- a/app/src/main/java/ch/pizzalink/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzapp/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java @@ -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.RecyclerView; @@ -11,11 +11,11 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.helper.PriceHelper; -import ch.pizzalink.android.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.menu.MenuProductOptionValueModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzapp.android.helper.PriceHelper; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.menu.MenuProductOptionValueModel; /** * Created by cimenmus on 08/10/2017. diff --git a/app/src/main/java/ch/pizzalink/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java b/app/src/main/java/ch/pizzapp/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java similarity index 95% rename from app/src/main/java/ch/pizzalink/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java rename to app/src/main/java/ch/pizzapp/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java index 2b6dcaf..ac177ff 100644 --- a/app/src/main/java/ch/pizzalink/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzapp/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java @@ -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.RecyclerView; @@ -11,9 +11,9 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzalink.android.R; -import ch.pizzalink.android.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.AddressModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.AddressModel; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzalink/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java b/app/src/main/java/ch/pizzapp/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java similarity index 94% rename from app/src/main/java/ch/pizzalink/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java rename to app/src/main/java/ch/pizzapp/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java index 8e3ba67..bfba328 100644 --- a/app/src/main/java/ch/pizzalink/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzapp/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java @@ -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.RecyclerView; @@ -11,10 +11,10 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzalink.android.R; -import ch.pizzalink.android.helper.PriceHelper; -import ch.pizzalink.android.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.ShippingMethodModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.helper.PriceHelper; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.ShippingMethodModel; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzalink/android/api/ApiConstants.java b/app/src/main/java/ch/pizzapp/android/api/ApiConstants.java similarity index 94% rename from app/src/main/java/ch/pizzalink/android/api/ApiConstants.java rename to app/src/main/java/ch/pizzapp/android/api/ApiConstants.java index 056a63a..da2db0e 100644 --- a/app/src/main/java/ch/pizzalink/android/api/ApiConstants.java +++ b/app/src/main/java/ch/pizzapp/android/api/ApiConstants.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.api; +package ch.pizzapp.android.api; public class ApiConstants { public static final int API_READ_TIMEOUT = 30; diff --git a/app/src/main/java/ch/pizzalink/android/api/ApiEndPoints.java b/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java similarity index 98% rename from app/src/main/java/ch/pizzalink/android/api/ApiEndPoints.java rename to app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java index ae0c378..d4a5cdc 100644 --- a/app/src/main/java/ch/pizzalink/android/api/ApiEndPoints.java +++ b/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.api; +package ch.pizzapp.android.api; public class ApiEndPoints { diff --git a/app/src/main/java/ch/pizzalink/android/api/ApiError.java b/app/src/main/java/ch/pizzapp/android/api/ApiError.java similarity index 95% rename from app/src/main/java/ch/pizzalink/android/api/ApiError.java rename to app/src/main/java/ch/pizzapp/android/api/ApiError.java index 29c335a..f46ee28 100644 --- a/app/src/main/java/ch/pizzalink/android/api/ApiError.java +++ b/app/src/main/java/ch/pizzapp/android/api/ApiError.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.api; +package ch.pizzapp.android.api; public class ApiError { diff --git a/app/src/main/java/ch/pizzalink/android/api/ApiErrorUtils.java b/app/src/main/java/ch/pizzapp/android/api/ApiErrorUtils.java similarity index 90% rename from app/src/main/java/ch/pizzalink/android/api/ApiErrorUtils.java rename to app/src/main/java/ch/pizzapp/android/api/ApiErrorUtils.java index 12ed3b2..531adbf 100644 --- a/app/src/main/java/ch/pizzalink/android/api/ApiErrorUtils.java +++ b/app/src/main/java/ch/pizzapp/android/api/ApiErrorUtils.java @@ -1,15 +1,15 @@ -package ch.pizzalink.android.api; +package ch.pizzapp.android.api; import android.content.Intent; import java.io.IOException; import java.lang.annotation.Annotation; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.activity.LoginActivity; -import ch.pizzalink.android.helper.DialogHelper; -import ch.pizzalink.android.helper.SharedPrefsHelper; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzapp.android.activity.LoginActivity; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.SharedPrefsHelper; import okhttp3.ResponseBody; import retrofit2.Converter; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzalink/android/api/ApiInterface.java b/app/src/main/java/ch/pizzapp/android/api/ApiInterface.java similarity index 82% rename from app/src/main/java/ch/pizzalink/android/api/ApiInterface.java rename to app/src/main/java/ch/pizzapp/android/api/ApiInterface.java index ea6d97a..82cd042 100644 --- a/app/src/main/java/ch/pizzalink/android/api/ApiInterface.java +++ b/app/src/main/java/ch/pizzapp/android/api/ApiInterface.java @@ -1,26 +1,26 @@ -package ch.pizzalink.android.api; +package ch.pizzapp.android.api; import java.util.HashMap; -import ch.pizzalink.android.model.AddNewAddressResponseModel; -import ch.pizzalink.android.model.AddProductToBasketResponseModel; -import ch.pizzalink.android.model.AddressModel; -import ch.pizzalink.android.model.AppVersionModel; -import ch.pizzalink.android.model.CheckCouponModel; -import ch.pizzalink.android.model.CountryModel; -import ch.pizzalink.android.model.DeleteAddressResponseModel; -import ch.pizzalink.android.model.PaymentMethodsResponseModel; -import ch.pizzalink.android.model.RemoveProductFromCartResponseModel; -import ch.pizzalink.android.model.ShippingMethodModel; -import ch.pizzalink.android.model.StoreInfoModel; -import ch.pizzalink.android.model.CityModel; -import ch.pizzalink.android.model.ZoneModel; -import ch.pizzalink.android.model.cart.CartInfoModel; -import ch.pizzalink.android.model.CategoryModel; -import ch.pizzalink.android.model.history.OrderHistoryModel; -import ch.pizzalink.android.model.UserModel; -import ch.pizzalink.android.model.history.OrderHistoryProductModel; -import ch.pizzalink.android.model.menu.MenuProductModel; +import ch.pizzapp.android.model.AddNewAddressResponseModel; +import ch.pizzapp.android.model.AddProductToBasketResponseModel; +import ch.pizzapp.android.model.AddressModel; +import ch.pizzapp.android.model.AppVersionModel; +import ch.pizzapp.android.model.CheckCouponModel; +import ch.pizzapp.android.model.CountryModel; +import ch.pizzapp.android.model.DeleteAddressResponseModel; +import ch.pizzapp.android.model.PaymentMethodsResponseModel; +import ch.pizzapp.android.model.RemoveProductFromCartResponseModel; +import ch.pizzapp.android.model.ShippingMethodModel; +import ch.pizzapp.android.model.StoreInfoModel; +import ch.pizzapp.android.model.CityModel; +import ch.pizzapp.android.model.ZoneModel; +import ch.pizzapp.android.model.cart.CartInfoModel; +import ch.pizzapp.android.model.CategoryModel; +import ch.pizzapp.android.model.history.OrderHistoryModel; +import ch.pizzapp.android.model.UserModel; +import ch.pizzapp.android.model.history.OrderHistoryProductModel; +import ch.pizzapp.android.model.menu.MenuProductModel; import okhttp3.RequestBody; import retrofit2.Call; import retrofit2.http.Body; diff --git a/app/src/main/java/ch/pizzalink/android/api/ApiService.java b/app/src/main/java/ch/pizzapp/android/api/ApiService.java similarity index 98% rename from app/src/main/java/ch/pizzalink/android/api/ApiService.java rename to app/src/main/java/ch/pizzapp/android/api/ApiService.java index 2fde006..7179396 100644 --- a/app/src/main/java/ch/pizzalink/android/api/ApiService.java +++ b/app/src/main/java/ch/pizzapp/android/api/ApiService.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.api; +package ch.pizzapp.android.api; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/app/src/main/java/ch/pizzalink/android/api/BaseResponse.java b/app/src/main/java/ch/pizzapp/android/api/BaseResponse.java similarity index 94% rename from app/src/main/java/ch/pizzalink/android/api/BaseResponse.java rename to app/src/main/java/ch/pizzapp/android/api/BaseResponse.java index fe9ef98..b95346e 100644 --- a/app/src/main/java/ch/pizzalink/android/api/BaseResponse.java +++ b/app/src/main/java/ch/pizzapp/android/api/BaseResponse.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.api; +package ch.pizzapp.android.api; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/api/ResponseArray.java b/app/src/main/java/ch/pizzapp/android/api/ResponseArray.java similarity index 91% rename from app/src/main/java/ch/pizzalink/android/api/ResponseArray.java rename to app/src/main/java/ch/pizzapp/android/api/ResponseArray.java index 4169a2f..5876872 100644 --- a/app/src/main/java/ch/pizzalink/android/api/ResponseArray.java +++ b/app/src/main/java/ch/pizzapp/android/api/ResponseArray.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.api; +package ch.pizzapp.android.api; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/api/ResponseObject.java b/app/src/main/java/ch/pizzapp/android/api/ResponseObject.java similarity index 90% rename from app/src/main/java/ch/pizzalink/android/api/ResponseObject.java rename to app/src/main/java/ch/pizzapp/android/api/ResponseObject.java index 0fd4397..f74d3d3 100644 --- a/app/src/main/java/ch/pizzalink/android/api/ResponseObject.java +++ b/app/src/main/java/ch/pizzapp/android/api/ResponseObject.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.api; +package ch.pizzapp.android.api; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/dialog/ProductPropertiesBottomSheetDialog.java b/app/src/main/java/ch/pizzapp/android/dialog/ProductPropertiesBottomSheetDialog.java similarity index 93% rename from app/src/main/java/ch/pizzalink/android/dialog/ProductPropertiesBottomSheetDialog.java rename to app/src/main/java/ch/pizzapp/android/dialog/ProductPropertiesBottomSheetDialog.java index 6b65d05..330208b 100644 --- a/app/src/main/java/ch/pizzalink/android/dialog/ProductPropertiesBottomSheetDialog.java +++ b/app/src/main/java/ch/pizzapp/android/dialog/ProductPropertiesBottomSheetDialog.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.dialog; +package ch.pizzapp.android.dialog; import android.app.Dialog; import android.os.Bundle; @@ -20,26 +20,26 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.activity.MainActivity; -import ch.pizzalink.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter; -import ch.pizzalink.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter; -import ch.pizzalink.android.api.ApiEndPoints; -import ch.pizzalink.android.api.ApiErrorUtils; -import ch.pizzalink.android.api.ApiService; -import ch.pizzalink.android.api.ResponseObject; -import ch.pizzalink.android.helper.DialogHelper; -import ch.pizzalink.android.helper.ImageLoadHelper; -import ch.pizzalink.android.helper.PriceHelper; -import ch.pizzalink.android.helper.SessionHelper; -import ch.pizzalink.android.helper.SharedPrefsHelper; -import ch.pizzalink.android.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.AddProductToBasketResponseModel; -import ch.pizzalink.android.model.cart.CartInfoModel; -import ch.pizzalink.android.model.menu.MenuProductModel; -import ch.pizzalink.android.model.menu.MenuProductOptionModel; -import ch.pizzalink.android.model.menu.MenuProductOptionValueModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzapp.android.activity.MainActivity; +import ch.pizzapp.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter; +import ch.pizzapp.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter; +import ch.pizzapp.android.api.ApiEndPoints; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseObject; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.ImageLoadHelper; +import ch.pizzapp.android.helper.PriceHelper; +import ch.pizzapp.android.helper.SessionHelper; +import ch.pizzapp.android.helper.SharedPrefsHelper; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.AddProductToBasketResponseModel; +import ch.pizzapp.android.model.cart.CartInfoModel; +import ch.pizzapp.android.model.menu.MenuProductModel; +import ch.pizzapp.android.model.menu.MenuProductOptionModel; +import ch.pizzapp.android.model.menu.MenuProductOptionValueModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/BaseFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/BaseFragment.java similarity index 82% rename from app/src/main/java/ch/pizzalink/android/fragment/BaseFragment.java rename to app/src/main/java/ch/pizzapp/android/fragment/BaseFragment.java index e92c0ad..6cf5256 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/BaseFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/BaseFragment.java @@ -1,8 +1,8 @@ -package ch.pizzalink.android.fragment; +package ch.pizzapp.android.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. diff --git a/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java similarity index 93% rename from app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java rename to app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java index 91bf717..e4ec69f 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.fragment; +package ch.pizzapp.android.fragment; import android.content.Intent; import android.os.Bundle; @@ -25,23 +25,23 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.activity.CreateOrderActivity; -import ch.pizzalink.android.activity.MainActivity; -import ch.pizzalink.android.adapter.recycler.CartRecyclerAdapter; -import ch.pizzalink.android.api.ApiEndPoints; -import ch.pizzalink.android.api.ApiErrorUtils; -import ch.pizzalink.android.api.ApiService; -import ch.pizzalink.android.api.ResponseObject; -import ch.pizzalink.android.helper.DialogHelper; -import ch.pizzalink.android.helper.PriceHelper; -import ch.pizzalink.android.helper.SessionHelper; -import ch.pizzalink.android.helper.SharedPrefsHelper; -import ch.pizzalink.android.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.RemoveProductFromCartResponseModel; -import ch.pizzalink.android.model.cart.CartInfoModel; -import ch.pizzalink.android.model.cart.CartProductModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzapp.android.activity.CreateOrderActivity; +import ch.pizzapp.android.activity.MainActivity; +import ch.pizzapp.android.adapter.recycler.CartRecyclerAdapter; +import ch.pizzapp.android.api.ApiEndPoints; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseObject; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.PriceHelper; +import ch.pizzapp.android.helper.SessionHelper; +import ch.pizzapp.android.helper.SharedPrefsHelper; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.RemoveProductFromCartResponseModel; +import ch.pizzapp.android.model.cart.CartInfoModel; +import ch.pizzapp.android.model.cart.CartProductModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/MenuFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java similarity index 87% rename from app/src/main/java/ch/pizzalink/android/fragment/MenuFragment.java rename to app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java index 5ab9537..bf9cf57 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/MenuFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.fragment; +package ch.pizzapp.android.fragment; import android.content.Intent; import android.os.Bundle; @@ -14,21 +14,21 @@ import java.util.Comparator; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.activity.MainActivity; -import ch.pizzalink.android.activity.ProductPropertiesActivity; -import ch.pizzalink.android.adapter.recycler.MenuProductRecyclerAdapter; -import ch.pizzalink.android.api.ApiErrorUtils; -import ch.pizzalink.android.api.ApiService; -import ch.pizzalink.android.api.ResponseArray; -import ch.pizzalink.android.dialog.ProductPropertiesBottomSheetDialog; -import ch.pizzalink.android.helper.DialogHelper; -import ch.pizzalink.android.helper.DisplayHelper; -import ch.pizzalink.android.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.CategoryModel; -import ch.pizzalink.android.model.menu.MenuProductModel; -import ch.pizzalink.android.view.GridSpacesItemDecoration; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzapp.android.activity.MainActivity; +import ch.pizzapp.android.activity.ProductPropertiesActivity; +import ch.pizzapp.android.adapter.recycler.MenuProductRecyclerAdapter; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseArray; +import ch.pizzapp.android.dialog.ProductPropertiesBottomSheetDialog; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.DisplayHelper; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.CategoryModel; +import ch.pizzapp.android.model.menu.MenuProductModel; +import ch.pizzapp.android.view.GridSpacesItemDecoration; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/OrderHistoryFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/OrderHistoryFragment.java similarity index 89% rename from app/src/main/java/ch/pizzalink/android/fragment/OrderHistoryFragment.java rename to app/src/main/java/ch/pizzapp/android/fragment/OrderHistoryFragment.java index 45120df..3fbd215 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/OrderHistoryFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/OrderHistoryFragment.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.fragment; +package ch.pizzapp.android.fragment; import android.content.Intent; import android.os.Bundle; @@ -13,17 +13,17 @@ import java.util.ArrayList; import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.activity.OrderHistoryDetailsActivity; -import ch.pizzalink.android.adapter.recycler.OrderHistoryRecyclerAdapter; -import ch.pizzalink.android.api.ApiErrorUtils; -import ch.pizzalink.android.api.ApiService; -import ch.pizzalink.android.api.ResponseArray; -import ch.pizzalink.android.helper.DialogHelper; -import ch.pizzalink.android.helper.SessionHelper; -import ch.pizzalink.android.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.history.OrderHistoryModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzapp.android.activity.OrderHistoryDetailsActivity; +import ch.pizzapp.android.adapter.recycler.OrderHistoryRecyclerAdapter; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseArray; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.SessionHelper; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.history.OrderHistoryModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/ProductFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/ProductFragment.java similarity index 86% rename from app/src/main/java/ch/pizzalink/android/fragment/ProductFragment.java rename to app/src/main/java/ch/pizzapp/android/fragment/ProductFragment.java index 45e152c..8835994 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/ProductFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/ProductFragment.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.fragment; +package ch.pizzapp.android.fragment; import android.content.Intent; import android.os.Bundle; @@ -12,22 +12,22 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.activity.MainActivity; -import ch.pizzalink.android.activity.ProductPropertiesActivity; -import ch.pizzalink.android.adapter.recycler.MenuProductRecyclerAdapter; -import ch.pizzalink.android.api.ApiConstants; -import ch.pizzalink.android.api.ApiErrorUtils; -import ch.pizzalink.android.api.ApiService; -import ch.pizzalink.android.api.ResponseArray; -import ch.pizzalink.android.dialog.ProductPropertiesBottomSheetDialog; -import ch.pizzalink.android.helper.DialogHelper; -import ch.pizzalink.android.helper.DisplayHelper; -import ch.pizzalink.android.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.CategoryModel; -import ch.pizzalink.android.model.menu.MenuProductModel; -import ch.pizzalink.android.view.GridSpacesItemDecoration; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzapp.android.activity.MainActivity; +import ch.pizzapp.android.activity.ProductPropertiesActivity; +import ch.pizzapp.android.adapter.recycler.MenuProductRecyclerAdapter; +import ch.pizzapp.android.api.ApiConstants; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseArray; +import ch.pizzapp.android.dialog.ProductPropertiesBottomSheetDialog; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.DisplayHelper; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.CategoryModel; +import ch.pizzapp.android.model.menu.MenuProductModel; +import ch.pizzapp.android.view.GridSpacesItemDecoration; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/ProfileFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java similarity index 85% rename from app/src/main/java/ch/pizzalink/android/fragment/ProfileFragment.java rename to app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java index d8daf01..fba9812 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/ProfileFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.fragment; +package ch.pizzapp.android.fragment; import android.content.Intent; import android.os.Bundle; @@ -6,7 +6,6 @@ import android.support.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; import android.widget.RelativeLayout; import com.afollestad.materialdialogs.DialogAction; @@ -16,20 +15,20 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.activity.LoginActivity; -import ch.pizzalink.android.activity.MyAddressesActivity; -import ch.pizzalink.android.activity.UpdatePasswordActivity; -import ch.pizzalink.android.activity.UpdateProfileActivity; -import ch.pizzalink.android.api.ApiErrorUtils; -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.model.UserModel; -import ch.pizzalink.android.view.PizzalinkInfoView; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzapp.android.activity.LoginActivity; +import ch.pizzapp.android.activity.MyAddressesActivity; +import ch.pizzapp.android.activity.UpdatePasswordActivity; +import ch.pizzapp.android.activity.UpdateProfileActivity; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseObject; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.SessionHelper; +import ch.pizzapp.android.helper.SharedPrefsHelper; +import ch.pizzapp.android.model.UserModel; +import ch.pizzapp.android.view.AppInfoView; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -42,10 +41,14 @@ import static android.app.Activity.RESULT_OK; public class ProfileFragment extends BaseFragment { - @BindView(R.id.firstnamePizzalinkInfoLayout) PizzalinkInfoView firstnamePizzalinkInfoLayout; - @BindView(R.id.lastnamePizzalinkInfoLayout) PizzalinkInfoView lastnamePizzalinkInfoLayout; - @BindView(R.id.emailPizzalinkInfoLayout) PizzalinkInfoView emailPizzalinkInfoLayout; - @BindView(R.id.phonePizzalinkInfoLayout) PizzalinkInfoView phonePizzalinkInfoLayout; + @BindView(R.id.firstnamePizzalinkInfoLayout) + AppInfoView firstnamePizzalinkInfoLayout; + @BindView(R.id.lastnamePizzalinkInfoLayout) + AppInfoView lastnamePizzalinkInfoLayout; + @BindView(R.id.emailPizzalinkInfoLayout) + AppInfoView emailPizzalinkInfoLayout; + @BindView(R.id.phonePizzalinkInfoLayout) + AppInfoView phonePizzalinkInfoLayout; @BindView(R.id.myAddressesLayout) RelativeLayout myAddressesLayout; @BindView(R.id.updateProfileLayout) RelativeLayout updateProfileLayout; @BindView(R.id.updatePasswordLayout) RelativeLayout updatePasswordLayout; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/StoreInfoFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/StoreInfoFragment.java similarity index 89% rename from app/src/main/java/ch/pizzalink/android/fragment/StoreInfoFragment.java rename to app/src/main/java/ch/pizzapp/android/fragment/StoreInfoFragment.java index 0412dc2..e24969d 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/StoreInfoFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/StoreInfoFragment.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.fragment; +package ch.pizzapp.android.fragment; import android.os.Bundle; import android.text.Html; @@ -11,12 +11,12 @@ import android.webkit.WebViewClient; import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzalink.android.R; -import ch.pizzalink.android.api.ApiErrorUtils; -import ch.pizzalink.android.api.ApiService; -import ch.pizzalink.android.api.ResponseObject; -import ch.pizzalink.android.helper.DialogHelper; -import ch.pizzalink.android.model.StoreInfoModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseObject; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.model.StoreInfoModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderBaseFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderBaseFragment.java similarity index 68% rename from app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderBaseFragment.java rename to app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderBaseFragment.java index d4c9815..82ab714 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderBaseFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderBaseFragment.java @@ -1,10 +1,10 @@ -package ch.pizzalink.android.fragment.createOrder; +package ch.pizzapp.android.fragment.createOrder; import android.widget.TextView; import butterknife.BindView; -import ch.pizzalink.android.R; -import ch.pizzalink.android.fragment.BaseFragment; +import ch.pizzapp.android.R; +import ch.pizzapp.android.fragment.BaseFragment; /** * Created by cimenmus on 21.10.2017. diff --git a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderNoteFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderNoteFragment.java similarity index 77% rename from app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderNoteFragment.java rename to app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderNoteFragment.java index 65d27d2..43209f3 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderNoteFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderNoteFragment.java @@ -1,39 +1,22 @@ -package ch.pizzalink.android.fragment.createOrder; +package ch.pizzapp.android.fragment.createOrder; import android.os.Bundle; 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.View; import android.view.ViewGroup; import android.widget.LinearLayout; -import android.widget.RelativeLayout; import java.util.ArrayList; -import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.activity.CreateOrderActivity; -import ch.pizzalink.android.adapter.recycler.PaymentMethodsRecyclerAdapter; -import ch.pizzalink.android.api.ApiErrorUtils; -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; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.CreateOrderActivity; +import ch.pizzapp.android.helper.SharedPrefsHelper; +import ch.pizzapp.android.model.cart.CartProductModel; +import ch.pizzapp.android.view.AppEditText; /** * Created by cimenmus on 28.10.2017. @@ -41,7 +24,8 @@ import retrofit2.Response; 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.yesRadioButton) AppCompatRadioButton yesRadioButton; @BindView(R.id.noRadioButton) AppCompatRadioButton noRadioButton; @@ -92,7 +76,7 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment { createOrderActivity.setSlicePizza(false); } } - createOrderActivity.setOrderNote(orderNotePizzalinkEditText.getText()); + createOrderActivity.setOrderNote(orderNoteAppEditText.getText()); createOrderActivity.onNextClicked(FRAGMENT_NAME); break; } @@ -114,7 +98,7 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment { } } if(createOrderActivity.getOrderNote() != null){ - orderNotePizzalinkEditText.setText(createOrderActivity.getOrderNote()); + orderNoteAppEditText.setText(createOrderActivity.getOrderNote()); } } diff --git a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderResultFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderResultFragment.java similarity index 88% rename from app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderResultFragment.java rename to app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderResultFragment.java index afbf0bb..4a46015 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderResultFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderResultFragment.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.fragment.createOrder; +package ch.pizzapp.android.fragment.createOrder; import android.os.Bundle; import android.view.LayoutInflater; @@ -8,9 +8,9 @@ import android.view.ViewGroup; import butterknife.BindString; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.CreateOrderActivity; -import ch.pizzalink.android.helper.SharedPrefsHelper; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.CreateOrderActivity; +import ch.pizzapp.android.helper.SharedPrefsHelper; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java similarity index 82% rename from app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderSummaryFragment.java rename to app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java index dc82948..2cc963d 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderSummaryFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.fragment.createOrder; +package ch.pizzapp.android.fragment.createOrder; import android.os.Bundle; import android.view.LayoutInflater; @@ -12,18 +12,18 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.CreateOrderActivity; -import ch.pizzalink.android.api.ApiEndPoints; -import ch.pizzalink.android.api.ApiErrorUtils; -import ch.pizzalink.android.api.ApiService; -import ch.pizzalink.android.api.ResponseObject; -import ch.pizzalink.android.helper.DialogHelper; -import ch.pizzalink.android.helper.PriceHelper; -import ch.pizzalink.android.helper.SessionHelper; -import ch.pizzalink.android.helper.SharedPrefsHelper; -import ch.pizzalink.android.model.cart.CartProductModel; -import ch.pizzalink.android.view.PizzalinkInfoView; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.CreateOrderActivity; +import ch.pizzapp.android.api.ApiEndPoints; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseObject; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.PriceHelper; +import ch.pizzapp.android.helper.SessionHelper; +import ch.pizzapp.android.helper.SharedPrefsHelper; +import ch.pizzapp.android.model.cart.CartProductModel; +import ch.pizzapp.android.view.AppInfoView; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -34,12 +34,18 @@ import retrofit2.Response; public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { - @BindView(R.id.orderPersonFullnamePizzalinkInfoLayout) PizzalinkInfoView orderPersonFullnamePizzalinkInfoLayout; - @BindView(R.id.orderShippingMethodPizzalinkInfoLayout) PizzalinkInfoView orderShippingMethodPizzalinkInfoLayout; - @BindView(R.id.orderShippingAddressPizzalinkInfoLayout) PizzalinkInfoView orderShippingAddressPizzalinkInfoLayout; - @BindView(R.id.orderPaymentMethodPizzalinkInfoLayout) PizzalinkInfoView orderPaymentMethodPizzalinkInfoLayout; - @BindView(R.id.orderTotalPizzalinkInfoLayout) PizzalinkInfoView orderTotalPizzalinkInfoLayout; - @BindView(R.id.orderNotePizzalinkInfoLayout) PizzalinkInfoView orderNotePizzalinkInfoLayout; + @BindView(R.id.orderPersonFullnamePizzalinkInfoLayout) + AppInfoView orderPersonFullnamePizzalinkInfoLayout; + @BindView(R.id.orderShippingMethodPizzalinkInfoLayout) + AppInfoView orderShippingMethodPizzalinkInfoLayout; + @BindView(R.id.orderShippingAddressPizzalinkInfoLayout) + 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.slice_pizza) String slicePizzaText; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/PaymentMethodFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java similarity index 88% rename from app/src/main/java/ch/pizzalink/android/fragment/createOrder/PaymentMethodFragment.java rename to app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java index 2a0f411..4d07c3b 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/PaymentMethodFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java @@ -1,9 +1,8 @@ -package ch.pizzalink.android.fragment.createOrder; +package ch.pizzapp.android.fragment.createOrder; import android.os.Bundle; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -14,22 +13,22 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.activity.CreateOrderActivity; -import ch.pizzalink.android.adapter.recycler.PaymentMethodsRecyclerAdapter; -import ch.pizzalink.android.api.ApiEndPoints; -import ch.pizzalink.android.api.ApiErrorUtils; -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.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.CheckCouponModel; -import ch.pizzalink.android.model.PaymentMethodModel; -import ch.pizzalink.android.model.PaymentMethodsResponseModel; -import ch.pizzalink.android.model.cart.CartInfoModel; -import ch.pizzalink.android.view.PizzalinkEditText; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzapp.android.activity.CreateOrderActivity; +import ch.pizzapp.android.adapter.recycler.PaymentMethodsRecyclerAdapter; +import ch.pizzapp.android.api.ApiEndPoints; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseObject; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.SessionHelper; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.CheckCouponModel; +import ch.pizzapp.android.model.PaymentMethodModel; +import ch.pizzapp.android.model.PaymentMethodsResponseModel; +import ch.pizzapp.android.model.cart.CartInfoModel; +import ch.pizzapp.android.view.AppEditText; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -41,7 +40,8 @@ import retrofit2.Response; public class PaymentMethodFragment extends CreateOrderBaseFragment { @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.alert_choose_payment_method) String choosePaymentMethodText; @@ -89,12 +89,12 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment { break; } - if(couponCodePizzalinkEditText.isEmpty()){ + if(couponCodeAppEditText.isEmpty()){ createOrderActivity.setSelectedPaymentMethod(selectedPaymentMethod); createOrderActivity.onNextClicked(FRAGMENT_NAME); } else { - createOrderActivity.setCouponCode(couponCodePizzalinkEditText.getText()); + createOrderActivity.setCouponCode(couponCodeAppEditText.getText()); checkCoupon(); } @@ -107,7 +107,7 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment { private void initViews(){ CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity(); if(createOrderActivity.getCouponCode() != null){ - couponCodePizzalinkEditText.setText(createOrderActivity.getCouponCode()); + couponCodeAppEditText.setText(createOrderActivity.getCouponCode()); } initRecyclerView(); } @@ -186,7 +186,7 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment { Call> call = ApiService.apiInterface.checkCoupon( ApiEndPoints.API_CHECK_COUPON + SessionHelper.getCustomerToken().getToken(), - couponCodePizzalinkEditText.getText()); + couponCodeAppEditText.getText()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { diff --git a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/ShippingAddressFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingAddressFragment.java similarity index 91% rename from app/src/main/java/ch/pizzalink/android/fragment/createOrder/ShippingAddressFragment.java rename to app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingAddressFragment.java index c61ff9d..633191f 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/ShippingAddressFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingAddressFragment.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.fragment.createOrder; +package ch.pizzapp.android.fragment.createOrder; import android.content.Intent; import android.os.Bundle; @@ -15,18 +15,18 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.AddAddressActivity; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.activity.CreateOrderActivity; -import ch.pizzalink.android.adapter.recycler.ShippingAddressesRecyclerAdapter; -import ch.pizzalink.android.api.ApiErrorUtils; -import ch.pizzalink.android.api.ApiService; -import ch.pizzalink.android.api.ResponseArray; -import ch.pizzalink.android.helper.DialogHelper; -import ch.pizzalink.android.helper.SessionHelper; -import ch.pizzalink.android.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.AddressModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.AddAddressActivity; +import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzapp.android.activity.CreateOrderActivity; +import ch.pizzapp.android.adapter.recycler.ShippingAddressesRecyclerAdapter; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseArray; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.SessionHelper; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.AddressModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/ShippingMethodFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java similarity index 89% rename from app/src/main/java/ch/pizzalink/android/fragment/createOrder/ShippingMethodFragment.java rename to app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java index 68186fa..0eeed0b 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/ShippingMethodFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.fragment.createOrder; +package ch.pizzapp.android.fragment.createOrder; import android.os.Bundle; import android.support.v7.widget.LinearLayoutManager; @@ -13,17 +13,17 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.activity.CreateOrderActivity; -import ch.pizzalink.android.adapter.recycler.ShippingMethodsRecyclerAdapter; -import ch.pizzalink.android.api.ApiErrorUtils; -import ch.pizzalink.android.api.ApiService; -import ch.pizzalink.android.api.ResponseArray; -import ch.pizzalink.android.helper.DialogHelper; -import ch.pizzalink.android.helper.SessionHelper; -import ch.pizzalink.android.interfaces.RecyclerItemClickListener; -import ch.pizzalink.android.model.ShippingMethodModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzapp.android.activity.CreateOrderActivity; +import ch.pizzapp.android.adapter.recycler.ShippingMethodsRecyclerAdapter; +import ch.pizzapp.android.api.ApiErrorUtils; +import ch.pizzapp.android.api.ApiService; +import ch.pizzapp.android.api.ResponseArray; +import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.SessionHelper; +import ch.pizzapp.android.interfaces.RecyclerItemClickListener; +import ch.pizzapp.android.model.ShippingMethodModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzalink/android/helper/DateTimeHelper.java b/app/src/main/java/ch/pizzapp/android/helper/DateTimeHelper.java similarity index 95% rename from app/src/main/java/ch/pizzalink/android/helper/DateTimeHelper.java rename to app/src/main/java/ch/pizzapp/android/helper/DateTimeHelper.java index 5e5bb17..13b63d8 100644 --- a/app/src/main/java/ch/pizzalink/android/helper/DateTimeHelper.java +++ b/app/src/main/java/ch/pizzapp/android/helper/DateTimeHelper.java @@ -1,12 +1,12 @@ -package ch.pizzalink.android.helper; +package ch.pizzapp.android.helper; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; /** * Created by cimenmus on 04/10/2017. diff --git a/app/src/main/java/ch/pizzalink/android/helper/DialogHelper.java b/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java similarity index 97% rename from app/src/main/java/ch/pizzalink/android/helper/DialogHelper.java rename to app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java index 93495e5..e6328c9 100644 --- a/app/src/main/java/ch/pizzalink/android/helper/DialogHelper.java +++ b/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.helper; +package ch.pizzapp.android.helper; import android.content.Context; import android.content.Intent; @@ -10,10 +10,10 @@ import com.afollestad.materialdialogs.MaterialDialog; import java.util.ArrayList; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.activity.LoginActivity; -import ch.pizzalink.android.activity.RegisterActivity; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzapp.android.activity.LoginActivity; +import ch.pizzapp.android.activity.RegisterActivity; public class DialogHelper { diff --git a/app/src/main/java/ch/pizzalink/android/helper/DisplayHelper.java b/app/src/main/java/ch/pizzapp/android/helper/DisplayHelper.java similarity index 93% rename from app/src/main/java/ch/pizzalink/android/helper/DisplayHelper.java rename to app/src/main/java/ch/pizzapp/android/helper/DisplayHelper.java index 95c5917..5ae1a69 100644 --- a/app/src/main/java/ch/pizzalink/android/helper/DisplayHelper.java +++ b/app/src/main/java/ch/pizzapp/android/helper/DisplayHelper.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.helper; +package ch.pizzapp.android.helper; import android.annotation.TargetApi; import android.os.Build; @@ -7,8 +7,8 @@ import android.util.DisplayMetrics; import android.view.Window; import android.view.WindowManager; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; public class DisplayHelper { diff --git a/app/src/main/java/ch/pizzalink/android/helper/ImageLoadHelper.java b/app/src/main/java/ch/pizzapp/android/helper/ImageLoadHelper.java similarity index 90% rename from app/src/main/java/ch/pizzalink/android/helper/ImageLoadHelper.java rename to app/src/main/java/ch/pizzapp/android/helper/ImageLoadHelper.java index fea0ece..43e9ae3 100644 --- a/app/src/main/java/ch/pizzalink/android/helper/ImageLoadHelper.java +++ b/app/src/main/java/ch/pizzapp/android/helper/ImageLoadHelper.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.helper; +package ch.pizzapp.android.helper; import android.content.Context; import android.graphics.Bitmap; @@ -10,7 +10,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import com.squareup.picasso.Picasso; -import ch.pizzalink.android.activity.BaseActivity; +import ch.pizzapp.android.activity.BaseActivity; public class ImageLoadHelper { diff --git a/app/src/main/java/ch/pizzalink/android/helper/NetworkHelper.java b/app/src/main/java/ch/pizzapp/android/helper/NetworkHelper.java similarity index 88% rename from app/src/main/java/ch/pizzalink/android/helper/NetworkHelper.java rename to app/src/main/java/ch/pizzapp/android/helper/NetworkHelper.java index 870fe10..b327f79 100644 --- a/app/src/main/java/ch/pizzalink/android/helper/NetworkHelper.java +++ b/app/src/main/java/ch/pizzapp/android/helper/NetworkHelper.java @@ -1,9 +1,9 @@ -package ch.pizzalink.android.helper; +package ch.pizzapp.android.helper; import android.content.Context; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import ch.pizzalink.android.activity.BaseActivity; +import ch.pizzapp.android.activity.BaseActivity; public class NetworkHelper { diff --git a/app/src/main/java/ch/pizzalink/android/helper/PasswordHelper.java b/app/src/main/java/ch/pizzapp/android/helper/PasswordHelper.java similarity index 93% rename from app/src/main/java/ch/pizzalink/android/helper/PasswordHelper.java rename to app/src/main/java/ch/pizzapp/android/helper/PasswordHelper.java index e82d717..0951bc2 100644 --- a/app/src/main/java/ch/pizzalink/android/helper/PasswordHelper.java +++ b/app/src/main/java/ch/pizzapp/android/helper/PasswordHelper.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.helper; +package ch.pizzapp.android.helper; import java.util.regex.Pattern; diff --git a/app/src/main/java/ch/pizzalink/android/helper/PriceHelper.java b/app/src/main/java/ch/pizzapp/android/helper/PriceHelper.java similarity index 95% rename from app/src/main/java/ch/pizzalink/android/helper/PriceHelper.java rename to app/src/main/java/ch/pizzapp/android/helper/PriceHelper.java index 4a8e68a..ad4a444 100644 --- a/app/src/main/java/ch/pizzalink/android/helper/PriceHelper.java +++ b/app/src/main/java/ch/pizzapp/android/helper/PriceHelper.java @@ -1,11 +1,11 @@ -package ch.pizzalink.android.helper; +package ch.pizzapp.android.helper; import java.util.ArrayList; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.model.menu.MenuProductModel; -import ch.pizzalink.android.model.menu.MenuProductOptionValueModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzapp.android.model.menu.MenuProductModel; +import ch.pizzapp.android.model.menu.MenuProductOptionValueModel; /** * Created by cimenmus on 12/10/2017. diff --git a/app/src/main/java/ch/pizzalink/android/helper/SessionHelper.java b/app/src/main/java/ch/pizzapp/android/helper/SessionHelper.java similarity index 92% rename from app/src/main/java/ch/pizzalink/android/helper/SessionHelper.java rename to app/src/main/java/ch/pizzapp/android/helper/SessionHelper.java index 37b3e6b..336b3ac 100644 --- a/app/src/main/java/ch/pizzalink/android/helper/SessionHelper.java +++ b/app/src/main/java/ch/pizzapp/android/helper/SessionHelper.java @@ -1,12 +1,12 @@ -package ch.pizzalink.android.helper; +package ch.pizzapp.android.helper; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import ch.pizzalink.android.model.CustomerTokenModel; -import ch.pizzalink.android.model.UserModel; +import ch.pizzapp.android.model.CustomerTokenModel; +import ch.pizzapp.android.model.UserModel; /** * Created by cimenmus on 11/09/2017. diff --git a/app/src/main/java/ch/pizzalink/android/helper/SharedPrefsHelper.java b/app/src/main/java/ch/pizzapp/android/helper/SharedPrefsHelper.java similarity index 97% rename from app/src/main/java/ch/pizzalink/android/helper/SharedPrefsHelper.java rename to app/src/main/java/ch/pizzapp/android/helper/SharedPrefsHelper.java index e41429f..6dd3e12 100644 --- a/app/src/main/java/ch/pizzalink/android/helper/SharedPrefsHelper.java +++ b/app/src/main/java/ch/pizzapp/android/helper/SharedPrefsHelper.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.helper; +package ch.pizzapp.android.helper; import android.content.SharedPreferences; @@ -11,10 +11,10 @@ import java.util.List; import java.util.Locale; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.model.CategoryModel; -import ch.pizzalink.android.model.CustomerTokenModel; -import ch.pizzalink.android.model.UserModel; +import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzapp.android.model.CategoryModel; +import ch.pizzapp.android.model.CustomerTokenModel; +import ch.pizzapp.android.model.UserModel; import static android.content.Context.MODE_PRIVATE; diff --git a/app/src/main/java/ch/pizzalink/android/helper/TextHelper.java b/app/src/main/java/ch/pizzapp/android/helper/TextHelper.java similarity index 96% rename from app/src/main/java/ch/pizzalink/android/helper/TextHelper.java rename to app/src/main/java/ch/pizzapp/android/helper/TextHelper.java index fe4efd4..75cbc19 100644 --- a/app/src/main/java/ch/pizzalink/android/helper/TextHelper.java +++ b/app/src/main/java/ch/pizzapp/android/helper/TextHelper.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.helper; +package ch.pizzapp.android.helper; import android.text.Html; import android.widget.TextView; diff --git a/app/src/main/java/ch/pizzalink/android/helper/ViewHelper.java b/app/src/main/java/ch/pizzapp/android/helper/ViewHelper.java similarity index 93% rename from app/src/main/java/ch/pizzalink/android/helper/ViewHelper.java rename to app/src/main/java/ch/pizzapp/android/helper/ViewHelper.java index a42888f..c336387 100644 --- a/app/src/main/java/ch/pizzalink/android/helper/ViewHelper.java +++ b/app/src/main/java/ch/pizzapp/android/helper/ViewHelper.java @@ -1,11 +1,11 @@ -package ch.pizzalink.android.helper; +package ch.pizzapp.android.helper; import android.app.Activity; import android.content.Context; import android.view.View; import android.view.inputmethod.InputMethodManager; -import ch.pizzalink.android.activity.BaseActivity; +import ch.pizzapp.android.activity.BaseActivity; /** * Created by cimenmus on 25/06/2017. diff --git a/app/src/main/java/ch/pizzalink/android/interfaces/CheckBoxChangedListener.java b/app/src/main/java/ch/pizzapp/android/interfaces/CheckBoxChangedListener.java similarity index 86% rename from app/src/main/java/ch/pizzalink/android/interfaces/CheckBoxChangedListener.java rename to app/src/main/java/ch/pizzapp/android/interfaces/CheckBoxChangedListener.java index a8207fd..18db245 100644 --- a/app/src/main/java/ch/pizzalink/android/interfaces/CheckBoxChangedListener.java +++ b/app/src/main/java/ch/pizzapp/android/interfaces/CheckBoxChangedListener.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.interfaces; +package ch.pizzapp.android.interfaces; import android.support.v7.widget.AppCompatCheckBox; import android.view.View; diff --git a/app/src/main/java/ch/pizzalink/android/interfaces/DialogButtonClickListener.java b/app/src/main/java/ch/pizzapp/android/interfaces/DialogButtonClickListener.java similarity index 80% rename from app/src/main/java/ch/pizzalink/android/interfaces/DialogButtonClickListener.java rename to app/src/main/java/ch/pizzapp/android/interfaces/DialogButtonClickListener.java index 8d09d03..ac8c9f8 100644 --- a/app/src/main/java/ch/pizzalink/android/interfaces/DialogButtonClickListener.java +++ b/app/src/main/java/ch/pizzapp/android/interfaces/DialogButtonClickListener.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.interfaces; +package ch.pizzapp.android.interfaces; import android.view.View; diff --git a/app/src/main/java/ch/pizzalink/android/interfaces/RecyclerItemClickListener.java b/app/src/main/java/ch/pizzapp/android/interfaces/RecyclerItemClickListener.java similarity index 81% rename from app/src/main/java/ch/pizzalink/android/interfaces/RecyclerItemClickListener.java rename to app/src/main/java/ch/pizzapp/android/interfaces/RecyclerItemClickListener.java index 372a342..900546d 100644 --- a/app/src/main/java/ch/pizzalink/android/interfaces/RecyclerItemClickListener.java +++ b/app/src/main/java/ch/pizzapp/android/interfaces/RecyclerItemClickListener.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.interfaces; +package ch.pizzapp.android.interfaces; import android.view.View; diff --git a/app/src/main/java/ch/pizzalink/android/model/AddNewAddressResponseModel.java b/app/src/main/java/ch/pizzapp/android/model/AddNewAddressResponseModel.java similarity index 92% rename from app/src/main/java/ch/pizzalink/android/model/AddNewAddressResponseModel.java rename to app/src/main/java/ch/pizzapp/android/model/AddNewAddressResponseModel.java index 1cc0b36..0d59198 100644 --- a/app/src/main/java/ch/pizzalink/android/model/AddNewAddressResponseModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/AddNewAddressResponseModel.java @@ -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.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/model/AddProductToBasketResponseModel.java b/app/src/main/java/ch/pizzapp/android/model/AddProductToBasketResponseModel.java similarity index 95% rename from app/src/main/java/ch/pizzalink/android/model/AddProductToBasketResponseModel.java rename to app/src/main/java/ch/pizzapp/android/model/AddProductToBasketResponseModel.java index a75cf00..56780cc 100644 --- a/app/src/main/java/ch/pizzalink/android/model/AddProductToBasketResponseModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/AddProductToBasketResponseModel.java @@ -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.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/model/AddToBasketOptionModel.java b/app/src/main/java/ch/pizzapp/android/model/AddToBasketOptionModel.java similarity index 97% rename from app/src/main/java/ch/pizzalink/android/model/AddToBasketOptionModel.java rename to app/src/main/java/ch/pizzapp/android/model/AddToBasketOptionModel.java index 29aa4c8..76b3a13 100644 --- a/app/src/main/java/ch/pizzalink/android/model/AddToBasketOptionModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/AddToBasketOptionModel.java @@ -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.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/model/AddressModel.java b/app/src/main/java/ch/pizzapp/android/model/AddressModel.java similarity index 96% rename from app/src/main/java/ch/pizzalink/android/model/AddressModel.java rename to app/src/main/java/ch/pizzapp/android/model/AddressModel.java index 6678308..ab5f667 100644 --- a/app/src/main/java/ch/pizzalink/android/model/AddressModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/AddressModel.java @@ -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.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/model/AppVersionModel.java b/app/src/main/java/ch/pizzapp/android/model/AppVersionModel.java similarity index 94% rename from app/src/main/java/ch/pizzalink/android/model/AppVersionModel.java rename to app/src/main/java/ch/pizzapp/android/model/AppVersionModel.java index 5c10998..300c917 100644 --- a/app/src/main/java/ch/pizzalink/android/model/AppVersionModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/AppVersionModel.java @@ -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.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/model/CategoryModel.java b/app/src/main/java/ch/pizzapp/android/model/CategoryModel.java similarity index 93% rename from app/src/main/java/ch/pizzalink/android/model/CategoryModel.java rename to app/src/main/java/ch/pizzapp/android/model/CategoryModel.java index 7d2395f..9afb41d 100644 --- a/app/src/main/java/ch/pizzalink/android/model/CategoryModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/CategoryModel.java @@ -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.SerializedName; @@ -6,8 +6,8 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; import java.util.ArrayList; -import ch.pizzalink.android.api.ApiConstants; -import ch.pizzalink.android.helper.SharedPrefsHelper; +import ch.pizzapp.android.api.ApiConstants; +import ch.pizzapp.android.helper.SharedPrefsHelper; /** * Created by cimenmus on 26/09/2017. diff --git a/app/src/main/java/ch/pizzalink/android/model/CheckCouponModel.java b/app/src/main/java/ch/pizzapp/android/model/CheckCouponModel.java similarity index 99% rename from app/src/main/java/ch/pizzalink/android/model/CheckCouponModel.java rename to app/src/main/java/ch/pizzapp/android/model/CheckCouponModel.java index bac389f..9eeb77e 100644 --- a/app/src/main/java/ch/pizzalink/android/model/CheckCouponModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/CheckCouponModel.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.model; +package ch.pizzapp.android.model; import android.util.Log; diff --git a/app/src/main/java/ch/pizzalink/android/model/CityModel.java b/app/src/main/java/ch/pizzapp/android/model/CityModel.java similarity index 97% rename from app/src/main/java/ch/pizzalink/android/model/CityModel.java rename to app/src/main/java/ch/pizzapp/android/model/CityModel.java index 3aea25a..e73f0bf 100644 --- a/app/src/main/java/ch/pizzalink/android/model/CityModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/CityModel.java @@ -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.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/model/CountryModel.java b/app/src/main/java/ch/pizzapp/android/model/CountryModel.java similarity index 97% rename from app/src/main/java/ch/pizzalink/android/model/CountryModel.java rename to app/src/main/java/ch/pizzapp/android/model/CountryModel.java index 67d93cd..232dcf1 100644 --- a/app/src/main/java/ch/pizzalink/android/model/CountryModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/CountryModel.java @@ -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.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/model/CreateOrderModel.java b/app/src/main/java/ch/pizzapp/android/model/CreateOrderModel.java similarity index 69% rename from app/src/main/java/ch/pizzalink/android/model/CreateOrderModel.java rename to app/src/main/java/ch/pizzapp/android/model/CreateOrderModel.java index f672b58..64ae92a 100644 --- a/app/src/main/java/ch/pizzalink/android/model/CreateOrderModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/CreateOrderModel.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.model; +package ch.pizzapp.android.model; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzalink/android/model/CustomerTokenModel.java b/app/src/main/java/ch/pizzapp/android/model/CustomerTokenModel.java similarity index 94% rename from app/src/main/java/ch/pizzalink/android/model/CustomerTokenModel.java rename to app/src/main/java/ch/pizzapp/android/model/CustomerTokenModel.java index 99d81b3..0c8eb0b 100644 --- a/app/src/main/java/ch/pizzalink/android/model/CustomerTokenModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/CustomerTokenModel.java @@ -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.SerializedName; @@ -9,7 +9,7 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import ch.pizzalink.android.helper.DateTimeHelper; +import ch.pizzapp.android.helper.DateTimeHelper; /** * Created by cimenmus on 26/09/2017. diff --git a/app/src/main/java/ch/pizzalink/android/model/DeleteAddressResponseModel.java b/app/src/main/java/ch/pizzapp/android/model/DeleteAddressResponseModel.java similarity index 88% rename from app/src/main/java/ch/pizzalink/android/model/DeleteAddressResponseModel.java rename to app/src/main/java/ch/pizzapp/android/model/DeleteAddressResponseModel.java index 333e73b..18f0c1d 100644 --- a/app/src/main/java/ch/pizzalink/android/model/DeleteAddressResponseModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/DeleteAddressResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.model; +package ch.pizzapp.android.model; /** * Created by cimenmus on 24.10.2017. diff --git a/app/src/main/java/ch/pizzalink/android/model/PaymentMethodModel.java b/app/src/main/java/ch/pizzapp/android/model/PaymentMethodModel.java similarity index 98% rename from app/src/main/java/ch/pizzalink/android/model/PaymentMethodModel.java rename to app/src/main/java/ch/pizzapp/android/model/PaymentMethodModel.java index 0513b11..6c1eefd 100644 --- a/app/src/main/java/ch/pizzalink/android/model/PaymentMethodModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/PaymentMethodModel.java @@ -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.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/model/PaymentMethodsResponseModel.java b/app/src/main/java/ch/pizzapp/android/model/PaymentMethodsResponseModel.java similarity index 94% rename from app/src/main/java/ch/pizzalink/android/model/PaymentMethodsResponseModel.java rename to app/src/main/java/ch/pizzapp/android/model/PaymentMethodsResponseModel.java index 7e20364..fe63e53 100644 --- a/app/src/main/java/ch/pizzalink/android/model/PaymentMethodsResponseModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/PaymentMethodsResponseModel.java @@ -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.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/model/RemoveProductFromCartResponseModel.java b/app/src/main/java/ch/pizzapp/android/model/RemoveProductFromCartResponseModel.java similarity index 91% rename from app/src/main/java/ch/pizzalink/android/model/RemoveProductFromCartResponseModel.java rename to app/src/main/java/ch/pizzapp/android/model/RemoveProductFromCartResponseModel.java index c1d0cc3..f90192e 100644 --- a/app/src/main/java/ch/pizzalink/android/model/RemoveProductFromCartResponseModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/RemoveProductFromCartResponseModel.java @@ -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.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/model/ShippingMethodModel.java b/app/src/main/java/ch/pizzapp/android/model/ShippingMethodModel.java similarity index 98% rename from app/src/main/java/ch/pizzalink/android/model/ShippingMethodModel.java rename to app/src/main/java/ch/pizzapp/android/model/ShippingMethodModel.java index 1012acd..7e1a7c1 100644 --- a/app/src/main/java/ch/pizzalink/android/model/ShippingMethodModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/ShippingMethodModel.java @@ -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.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/model/ShippingMethodsResponseModel.java b/app/src/main/java/ch/pizzapp/android/model/ShippingMethodsResponseModel.java similarity index 94% rename from app/src/main/java/ch/pizzalink/android/model/ShippingMethodsResponseModel.java rename to app/src/main/java/ch/pizzapp/android/model/ShippingMethodsResponseModel.java index 1967e40..3c813f2 100644 --- a/app/src/main/java/ch/pizzalink/android/model/ShippingMethodsResponseModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/ShippingMethodsResponseModel.java @@ -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.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/model/StoreInfoModel.java b/app/src/main/java/ch/pizzapp/android/model/StoreInfoModel.java similarity index 94% rename from app/src/main/java/ch/pizzalink/android/model/StoreInfoModel.java rename to app/src/main/java/ch/pizzapp/android/model/StoreInfoModel.java index b2c81db..27a518c 100644 --- a/app/src/main/java/ch/pizzalink/android/model/StoreInfoModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/StoreInfoModel.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.model; +package ch.pizzapp.android.model; /** * Created by cimenmus on 26.10.2017. diff --git a/app/src/main/java/ch/pizzalink/android/model/UserModel.java b/app/src/main/java/ch/pizzapp/android/model/UserModel.java similarity index 98% rename from app/src/main/java/ch/pizzalink/android/model/UserModel.java rename to app/src/main/java/ch/pizzapp/android/model/UserModel.java index 7dda978..3760b5a 100644 --- a/app/src/main/java/ch/pizzalink/android/model/UserModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/UserModel.java @@ -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.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/model/ZoneModel.java b/app/src/main/java/ch/pizzapp/android/model/ZoneModel.java similarity index 97% rename from app/src/main/java/ch/pizzalink/android/model/ZoneModel.java rename to app/src/main/java/ch/pizzapp/android/model/ZoneModel.java index 4b1b30e..8484645 100644 --- a/app/src/main/java/ch/pizzalink/android/model/ZoneModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/ZoneModel.java @@ -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.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/model/cart/CartInfoModel.java b/app/src/main/java/ch/pizzapp/android/model/cart/CartInfoModel.java similarity index 96% rename from app/src/main/java/ch/pizzalink/android/model/cart/CartInfoModel.java rename to app/src/main/java/ch/pizzapp/android/model/cart/CartInfoModel.java index 1cb56d1..e5a78ab 100644 --- a/app/src/main/java/ch/pizzalink/android/model/cart/CartInfoModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/cart/CartInfoModel.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.model.cart; +package ch.pizzapp.android.model.cart; import java.io.Serializable; import java.util.ArrayList; diff --git a/app/src/main/java/ch/pizzalink/android/model/cart/CartProductModel.java b/app/src/main/java/ch/pizzapp/android/model/cart/CartProductModel.java similarity index 98% rename from app/src/main/java/ch/pizzalink/android/model/cart/CartProductModel.java rename to app/src/main/java/ch/pizzapp/android/model/cart/CartProductModel.java index 60538cb..2cadbe8 100644 --- a/app/src/main/java/ch/pizzalink/android/model/cart/CartProductModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/cart/CartProductModel.java @@ -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.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/model/cart/CartProductOptionModel.java b/app/src/main/java/ch/pizzapp/android/model/cart/CartProductOptionModel.java similarity index 97% rename from app/src/main/java/ch/pizzalink/android/model/cart/CartProductOptionModel.java rename to app/src/main/java/ch/pizzapp/android/model/cart/CartProductOptionModel.java index f22de1f..ce234fd 100644 --- a/app/src/main/java/ch/pizzalink/android/model/cart/CartProductOptionModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/cart/CartProductOptionModel.java @@ -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.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/model/cart/CartTotalModel.java b/app/src/main/java/ch/pizzapp/android/model/cart/CartTotalModel.java similarity index 91% rename from app/src/main/java/ch/pizzalink/android/model/cart/CartTotalModel.java rename to app/src/main/java/ch/pizzapp/android/model/cart/CartTotalModel.java index 080c6ce..ebc597d 100644 --- a/app/src/main/java/ch/pizzalink/android/model/cart/CartTotalModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/cart/CartTotalModel.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.model.cart; +package ch.pizzapp.android.model.cart; import java.io.Serializable; diff --git a/app/src/main/java/ch/pizzalink/android/model/history/OrderHistoryModel.java b/app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryModel.java similarity index 99% rename from app/src/main/java/ch/pizzalink/android/model/history/OrderHistoryModel.java rename to app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryModel.java index 08effaa..b15a7a7 100644 --- a/app/src/main/java/ch/pizzalink/android/model/history/OrderHistoryModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryModel.java @@ -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.SerializedName; @@ -6,7 +6,7 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; import java.util.ArrayList; -import ch.pizzalink.android.helper.DateTimeHelper; +import ch.pizzapp.android.helper.DateTimeHelper; /** * Created by cimenmus on 04/10/2017. diff --git a/app/src/main/java/ch/pizzalink/android/model/history/OrderHistoryProductModel.java b/app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryProductModel.java similarity index 98% rename from app/src/main/java/ch/pizzalink/android/model/history/OrderHistoryProductModel.java rename to app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryProductModel.java index 8a95eba..1cb5685 100644 --- a/app/src/main/java/ch/pizzalink/android/model/history/OrderHistoryProductModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryProductModel.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.model.history; +package ch.pizzapp.android.model.history; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/model/history/OrderHistoryProductOptionModel.java b/app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryProductOptionModel.java similarity index 98% rename from app/src/main/java/ch/pizzalink/android/model/history/OrderHistoryProductOptionModel.java rename to app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryProductOptionModel.java index e6cda27..b48b5fa 100644 --- a/app/src/main/java/ch/pizzalink/android/model/history/OrderHistoryProductOptionModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryProductOptionModel.java @@ -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.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/model/menu/MenuProductModel.java b/app/src/main/java/ch/pizzapp/android/model/menu/MenuProductModel.java similarity index 95% rename from app/src/main/java/ch/pizzalink/android/model/menu/MenuProductModel.java rename to app/src/main/java/ch/pizzapp/android/model/menu/MenuProductModel.java index c550cdf..47e10e5 100644 --- a/app/src/main/java/ch/pizzalink/android/model/menu/MenuProductModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/menu/MenuProductModel.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.model.menu; +package ch.pizzapp.android.model.menu; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; @@ -6,9 +6,9 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; import java.util.ArrayList; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.model.cart.CartProductOptionModel; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzapp.android.model.cart.CartProductOptionModel; /** * Created by cimenmus on 08/10/2017. diff --git a/app/src/main/java/ch/pizzalink/android/model/menu/MenuProductOptionModel.java b/app/src/main/java/ch/pizzapp/android/model/menu/MenuProductOptionModel.java similarity index 98% rename from app/src/main/java/ch/pizzalink/android/model/menu/MenuProductOptionModel.java rename to app/src/main/java/ch/pizzapp/android/model/menu/MenuProductOptionModel.java index 9a7d421..afa4dd1 100644 --- a/app/src/main/java/ch/pizzalink/android/model/menu/MenuProductOptionModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/menu/MenuProductOptionModel.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.model.menu; +package ch.pizzapp.android.model.menu; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/model/menu/MenuProductOptionValueModel.java b/app/src/main/java/ch/pizzapp/android/model/menu/MenuProductOptionValueModel.java similarity index 98% rename from app/src/main/java/ch/pizzalink/android/model/menu/MenuProductOptionValueModel.java rename to app/src/main/java/ch/pizzapp/android/model/menu/MenuProductOptionValueModel.java index cc381a0..f141d84 100644 --- a/app/src/main/java/ch/pizzalink/android/model/menu/MenuProductOptionValueModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/menu/MenuProductOptionValueModel.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.model.menu; +package ch.pizzapp.android.model.menu; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzalink/android/view/PizzalinkButton.java b/app/src/main/java/ch/pizzapp/android/view/AppButton.java similarity index 79% rename from app/src/main/java/ch/pizzalink/android/view/PizzalinkButton.java rename to app/src/main/java/ch/pizzapp/android/view/AppButton.java index 0ddaf5a..98a353d 100644 --- a/app/src/main/java/ch/pizzalink/android/view/PizzalinkButton.java +++ b/app/src/main/java/ch/pizzapp/android/view/AppButton.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.view; +package ch.pizzapp.android.view; import android.content.Context; import android.content.res.TypedArray; @@ -7,32 +7,31 @@ import android.util.AttributeSet; import android.view.View; import android.widget.Button; import android.widget.LinearLayout; -import android.widget.RelativeLayout; -import ch.pizzalink.android.R; +import ch.pizzapp.android.R; /** * Created by cimenmus on 28/09/2017. */ -public class PizzalinkButton extends LinearLayout { +public class AppButton extends LinearLayout { private View rootView; private boolean isEnabled; private Button pizzalinkButton; private String text; - public PizzalinkButton(Context context) { + public AppButton(Context context) { super(context); init(context); } - public PizzalinkButton(Context context, AttributeSet attrs) { + public AppButton(Context context, AttributeSet attrs) { super(context, attrs); - TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.PizzalinkButton, 0, 0); + TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.AppButton, 0, 0); try { - isEnabled = a.getBoolean(R.styleable.PizzalinkButton_isEnabled, true); - text = a.getString(R.styleable.PizzalinkButton_text); + isEnabled = a.getBoolean(R.styleable.AppButton_isEnabled, true); + text = a.getString(R.styleable.AppButton_text); } finally { a.recycle(); } diff --git a/app/src/main/java/ch/pizzalink/android/view/PizzalinkDropdown.java b/app/src/main/java/ch/pizzapp/android/view/AppDropdown.java similarity index 69% rename from app/src/main/java/ch/pizzalink/android/view/PizzalinkDropdown.java rename to app/src/main/java/ch/pizzapp/android/view/AppDropdown.java index 44b9ef4..1b93ef5 100644 --- a/app/src/main/java/ch/pizzalink/android/view/PizzalinkDropdown.java +++ b/app/src/main/java/ch/pizzapp/android/view/AppDropdown.java @@ -1,29 +1,21 @@ -package ch.pizzalink.android.view; +package ch.pizzapp.android.view; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Typeface; -import android.text.Editable; -import android.text.InputType; -import android.text.TextWatcher; import android.util.AttributeSet; import android.util.Log; -import android.view.LayoutInflater; import android.view.View; -import android.view.inputmethod.InputMethodManager; -import android.widget.EditText; import android.widget.LinearLayout; import android.widget.TextView; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.helper.PasswordHelper; +import ch.pizzapp.android.R; /** * Created by cimenmus on 23.10.2017. */ -public class PizzalinkDropdown extends LinearLayout{ +public class AppDropdown extends LinearLayout{ private View rootView; private TextView hintTextView; @@ -31,16 +23,16 @@ public class PizzalinkDropdown extends LinearLayout{ private Typeface typeFace; private String hint; - public PizzalinkDropdown(Context context) { + public AppDropdown(Context context) { super(context); init(context); } - public PizzalinkDropdown(Context context, AttributeSet attrs) { + public AppDropdown(Context context, AttributeSet attrs) { super(context, attrs); - TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.PizzalinkDropdown, 0, 0); + TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.AppDropdown, 0, 0); try { - hint = a.getString(R.styleable.PizzalinkDropdown_dropdownHint); + hint = a.getString(R.styleable.AppDropdown_dropdownHint); } finally { a.recycle(); } diff --git a/app/src/main/java/ch/pizzalink/android/view/PizzalinkDropdownView.java b/app/src/main/java/ch/pizzapp/android/view/AppDropdownView.java similarity index 77% rename from app/src/main/java/ch/pizzalink/android/view/PizzalinkDropdownView.java rename to app/src/main/java/ch/pizzapp/android/view/AppDropdownView.java index 33a6d6c..27cd01f 100644 --- a/app/src/main/java/ch/pizzalink/android/view/PizzalinkDropdownView.java +++ b/app/src/main/java/ch/pizzapp/android/view/AppDropdownView.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.view; +package ch.pizzapp.android.view; import android.content.Context; import android.content.res.TypedArray; @@ -9,14 +9,14 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; /** * Created by cimenmus on 26.10.2017. */ -public class PizzalinkDropdownView extends LinearLayout { +public class AppDropdownView extends LinearLayout { private View rootView; private TextView hintTextView; @@ -25,18 +25,18 @@ public class PizzalinkDropdownView extends LinearLayout { private String hint; private String dropdownTheme; - public PizzalinkDropdownView(Context context) { + public AppDropdownView(Context context) { super(context); init(context); } - public PizzalinkDropdownView(Context context, AttributeSet attrs) { + public AppDropdownView(Context context, AttributeSet attrs) { super(context, attrs); - TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.PizzalinkDropdownView, 0, 0); + TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.AppDropdownView, 0, 0); try { - hint = a.getString(R.styleable.PizzalinkDropdownView_dropdownHintView); - dropdownTheme = a.getString(R.styleable.PizzalinkDropdownView_dropdownTheme); + hint = a.getString(R.styleable.AppDropdownView_dropdownHintView); + dropdownTheme = a.getString(R.styleable.AppDropdownView_dropdownTheme); } finally { a.recycle(); } diff --git a/app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java b/app/src/main/java/ch/pizzapp/android/view/AppEditText.java similarity index 90% rename from app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java rename to app/src/main/java/ch/pizzapp/android/view/AppEditText.java index 0d9422a..ad53b01 100644 --- a/app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java +++ b/app/src/main/java/ch/pizzapp/android/view/AppEditText.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.view; +package ch.pizzapp.android.view; import android.content.Context; import android.content.res.TypedArray; @@ -16,15 +16,15 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; -import ch.pizzalink.android.helper.PasswordHelper; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzapp.android.helper.PasswordHelper; /** * Created by cimenmus on 28/09/2017. */ -public class PizzalinkEditText extends LinearLayout implements View.OnClickListener { +public class AppEditText extends LinearLayout implements View.OnClickListener { private View rootView; private TextView hintTextView; @@ -47,18 +47,18 @@ public class PizzalinkEditText extends LinearLayout implements View.OnClickListe } */ - public PizzalinkEditText(Context context) { + public AppEditText(Context context) { super(context); init(context); } - public PizzalinkEditText(Context context, AttributeSet attrs) { + public AppEditText(Context context, AttributeSet attrs) { super(context, attrs); - TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.PizzalinkEditText, 0, 0); + TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.AppEditText, 0, 0); try { - hint = a.getString(R.styleable.PizzalinkEditText_hint); - inputType = a.getString(R.styleable.PizzalinkEditText_inputType); - edittextTheme = a.getString(R.styleable.PizzalinkEditText_edittextTheme); + hint = a.getString(R.styleable.AppEditText_hint); + inputType = a.getString(R.styleable.AppEditText_inputType); + edittextTheme = a.getString(R.styleable.AppEditText_edittextTheme); } finally { a.recycle(); } diff --git a/app/src/main/java/ch/pizzalink/android/view/PizzalinkInfoView.java b/app/src/main/java/ch/pizzapp/android/view/AppInfoView.java similarity index 74% rename from app/src/main/java/ch/pizzalink/android/view/PizzalinkInfoView.java rename to app/src/main/java/ch/pizzapp/android/view/AppInfoView.java index c79d78a..82e17c6 100644 --- a/app/src/main/java/ch/pizzalink/android/view/PizzalinkInfoView.java +++ b/app/src/main/java/ch/pizzapp/android/view/AppInfoView.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.view; +package ch.pizzapp.android.view; import android.content.Context; import android.content.res.TypedArray; @@ -7,13 +7,13 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import ch.pizzalink.android.R; +import ch.pizzapp.android.R; /** * Created by cimenmus on 24.10.2017. */ -public class PizzalinkInfoView extends LinearLayout { +public class AppInfoView extends LinearLayout { private View rootView; private TextView descriptionTextView; @@ -21,17 +21,17 @@ public class PizzalinkInfoView extends LinearLayout { private String description; private String text; - public PizzalinkInfoView(Context context) { + public AppInfoView(Context context) { super(context); init(context); } - public PizzalinkInfoView(Context context, AttributeSet attrs) { + public AppInfoView(Context context, AttributeSet attrs) { super(context, attrs); - TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.PizzalinkInfoView, 0, 0); + TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.AppInfoView, 0, 0); try { - description = a.getString(R.styleable.PizzalinkInfoView_description); - text = a.getString(R.styleable.PizzalinkInfoView_infoText); + description = a.getString(R.styleable.AppInfoView_description); + text = a.getString(R.styleable.AppInfoView_infoText); } finally { a.recycle(); } diff --git a/app/src/main/java/ch/pizzalink/android/view/PizzalinkToolbar.java b/app/src/main/java/ch/pizzapp/android/view/AppToolbar.java similarity index 82% rename from app/src/main/java/ch/pizzalink/android/view/PizzalinkToolbar.java rename to app/src/main/java/ch/pizzapp/android/view/AppToolbar.java index b686648..b9513bf 100644 --- a/app/src/main/java/ch/pizzalink/android/view/PizzalinkToolbar.java +++ b/app/src/main/java/ch/pizzapp/android/view/AppToolbar.java @@ -1,23 +1,21 @@ -package ch.pizzalink.android.view; +package ch.pizzapp.android.view; import android.content.Context; import android.content.res.TypedArray; -import android.graphics.Color; -import android.support.v4.content.ContextCompat; import android.support.v7.widget.Toolbar; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import ch.pizzalink.android.R; -import ch.pizzalink.android.activity.BaseActivity; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; /** * Created by cimenmus on 18/09/2017. */ -public class PizzalinkToolbar extends Toolbar { +public class AppToolbar extends Toolbar { private View rootView; private TextView toolbarTitleTextView; @@ -34,18 +32,18 @@ public class PizzalinkToolbar extends Toolbar { } */ - public PizzalinkToolbar(Context context) { + public AppToolbar(Context context) { super(context); init(context); } - public PizzalinkToolbar(Context context, AttributeSet attrs) { + public AppToolbar(Context context, AttributeSet attrs) { super(context, attrs); - TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.PizzalinkToolbar, 0, 0); + TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.AppToolbar, 0, 0); try { - showHamburgerIcon = a.getBoolean(R.styleable.PizzalinkToolbar_showHamburgerMenuIcon, false); - showBackIcon = a.getBoolean(R.styleable.PizzalinkToolbar_showBackIcon, false); - title = a.getString(R.styleable.PizzalinkToolbar_title); + showHamburgerIcon = a.getBoolean(R.styleable.AppToolbar_showHamburgerMenuIcon, false); + showBackIcon = a.getBoolean(R.styleable.AppToolbar_showBackIcon, false); + title = a.getString(R.styleable.AppToolbar_title); /* toolbarBackgroundColor = a.getColor(R.styleable.PizzalinkToolbar_toolbarBackgroundColor, ContextCompat.getColor(BaseActivity.currentActivity, R.color.colorPrimary)); diff --git a/app/src/main/java/ch/pizzalink/android/view/GridSpacesItemDecoration.java b/app/src/main/java/ch/pizzapp/android/view/GridSpacesItemDecoration.java similarity index 96% rename from app/src/main/java/ch/pizzalink/android/view/GridSpacesItemDecoration.java rename to app/src/main/java/ch/pizzapp/android/view/GridSpacesItemDecoration.java index ae52ef5..e0b05f2 100644 --- a/app/src/main/java/ch/pizzalink/android/view/GridSpacesItemDecoration.java +++ b/app/src/main/java/ch/pizzapp/android/view/GridSpacesItemDecoration.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.view; +package ch.pizzapp.android.view; import android.graphics.Rect; import android.support.v7.widget.RecyclerView; diff --git a/app/src/main/java/ch/pizzalink/android/view/NoSwipeViewPager.java b/app/src/main/java/ch/pizzapp/android/view/NoSwipeViewPager.java similarity index 96% rename from app/src/main/java/ch/pizzalink/android/view/NoSwipeViewPager.java rename to app/src/main/java/ch/pizzapp/android/view/NoSwipeViewPager.java index 142d872..c2be22d 100644 --- a/app/src/main/java/ch/pizzalink/android/view/NoSwipeViewPager.java +++ b/app/src/main/java/ch/pizzapp/android/view/NoSwipeViewPager.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.view; +package ch.pizzapp.android.view; import android.content.Context; import android.support.v4.view.ViewPager; diff --git a/app/src/main/res/layout/activity_add_address.xml b/app/src/main/res/layout/activity_add_address.xml index 556030f..07b031c 100644 --- a/app/src/main/res/layout/activity_add_address.xml +++ b/app/src/main/res/layout/activity_add_address.xml @@ -7,11 +7,11 @@ android:layout_height="match_parent" android:orientation="vertical" android:background="@color/white" - tools:context="ch.pizzalink.android.activity.AddAddressActivity" + tools:context="ch.pizzapp.android.activity.AddAddressActivity" android:focusable="true" android:focusableInTouchMode="true"> - - - - - - + tools:context="ch.pizzapp.android.activity.CreateOrderActivity"> - + tools:context="ch.pizzapp.android.activity.CreateOrderActivity"> + tools:context="ch.pizzapp.android.activity.ForgotPasswordActivity"> - - - - - + tools:context="ch.pizzapp.android.activity.MainActivity"> - + tools:context="ch.pizzapp.android.activity.MyAddressesActivity"> - - - - - - - - - - - - - - - - - - - - - - - + tools:context="ch.pizzapp.android.activity.UpdatePasswordActivity"> - - - - + tools:context="ch.pizzapp.android.activity.UpdateProfileActivity"> - - - - - - - - - - - - - - - - - - + @@ -9,28 +9,28 @@ - + - + - + - + - + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4a75228..e53f0ef 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ - Pizzalink + Pizzapp Es ist ein Fehler aufgetreten. Warnung Es ist ein Fehler aufgetreten. diff --git a/app/src/test/java/ch/pizzalink/android/ExampleUnitTest.java b/app/src/test/java/ch/pizzapp/android/ExampleUnitTest.java similarity index 92% rename from app/src/test/java/ch/pizzalink/android/ExampleUnitTest.java rename to app/src/test/java/ch/pizzapp/android/ExampleUnitTest.java index 26d98d7..a373c0d 100644 --- a/app/src/test/java/ch/pizzalink/android/ExampleUnitTest.java +++ b/app/src/test/java/ch/pizzapp/android/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android; +package ch.pizzapp.android; import org.junit.Test; diff --git a/build.gradle b/build.gradle index 95c05ad..fc5bfad 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -17,6 +18,7 @@ allprojects { jcenter() maven { url 'https://jitpack.io' } maven { url "https://maven.google.com" } + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 71403cc..8234f9c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Nov 22 20:22:25 EET 2017 +#Sat May 26 11:48:18 EET 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip