From 7c11f60a5516d9abd69c3095f8959dc165081561 Mon Sep 17 00:00:00 2001 From: cimenmus Date: Sun, 24 Jun 2018 15:00:14 +0300 Subject: [PATCH] test publish --- .idea/caches/build_file_checksums.ser | Bin 538 -> 538 bytes Capri.jks | Bin 0 -> 2142 bytes app/build.gradle | 4 +-- app/release/output.json | 2 +- .../android/activity/BaseActivity.java | 10 +++++++ .../pizzapp/android/helper/DialogHelper.java | 28 +++++++++--------- .../pizzapp/android/helper/DisplayHelper.java | 2 +- .../res/drawable/background_button_cart.xml | 4 +-- .../main/res/layout/activity_add_address.xml | 2 +- .../activity_campaign_product_details.xml | 16 +++++----- .../layout/activity_campaign_product_list.xml | 2 +- .../main/res/layout/activity_create_order.xml | 2 +- .../res/layout/activity_forgot_password.xml | 2 +- app/src/main/res/layout/activity_login.xml | 2 +- app/src/main/res/layout/activity_main.xml | 6 ++-- .../main/res/layout/activity_my_addresses.xml | 2 +- .../layout/activity_order_history_details.xml | 4 +-- .../res/layout/activity_product_details.xml | 16 +++++----- app/src/main/res/layout/activity_register.xml | 2 +- .../res/layout/activity_update_password.xml | 2 +- .../res/layout/activity_update_profile.xml | 2 +- app/src/main/res/layout/fragment_cart.xml | 2 +- .../res/layout/fragment_create_order_note.xml | 6 ++-- .../layout/fragment_create_order_result.xml | 2 +- .../res/layout/fragment_payment_method.xml | 2 +- app/src/main/res/layout/fragment_profile.xml | 22 +++++++------- .../main/res/layout/layout_bottomsheet.xml | 14 ++++----- .../res/layout/layout_pizzalink_dropdown.xml | 2 +- .../res/layout/layout_pizzalink_toolbar.xml | 2 +- .../main/res/layout/layout_pizzalink_view.xml | 2 +- app/src/main/res/layout/row_cart.xml | 18 +++++------ app/src/main/res/layout/row_category.xml | 4 +-- app/src/main/res/layout/row_menu_product.xml | 4 +-- app/src/main/res/layout/row_my_address.xml | 4 +-- .../main/res/layout/row_option_checkbox.xml | 4 +-- app/src/main/res/layout/row_option_radio.xml | 4 +-- app/src/main/res/layout/row_order_history.xml | 4 +-- .../main/res/layout/row_payment_method.xml | 2 +- app/src/main/res/layout/row_pizza_2.xml | 14 ++++----- .../main/res/layout/row_shipment_address.xml | 2 +- .../main/res/layout/row_shipment_method.xml | 4 +-- app/src/main/res/layout/row_subcategory.xml | 2 +- app/src/main/res/values/colors.xml | 2 ++ app/src/main/res/values/strings.xml | 12 +++----- pizzapp_jks | Bin 2263 -> 0 bytes pizzapp_keystore.txt | 20 ++++++++++--- 46 files changed, 142 insertions(+), 122 deletions(-) create mode 100644 Capri.jks delete mode 100644 pizzapp_jks diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 8e1b0dc2b1fcebe437d79b3592d4210c1f6a9dad..d8f686db61fb33e62f7717f11523927bb14b396d 100644 GIT binary patch delta 33 rcmV++0N($a1eyepm;^DZF3hoHZjv5y<)Nvw4=G3J#DgfQ>4i*3a diff --git a/Capri.jks b/Capri.jks new file mode 100644 index 0000000000000000000000000000000000000000..878cd9201394b7044afe090f23d68ca29347703e GIT binary patch literal 2142 zcmbtUc{J1u8=l|HSZ2gzkdb|B7^)ev#h@hnHX`Q~e+!-z^OT>-L2$4$E zM+z|{8B149$QH6MA%@TWmUHg+_xH#1$Mc-?zUO_P=bUG6VQ&Eh0)Yq_d&2<)*j~Xtr zTX`3Pa~Gy{@|wgf7c1jo-2nk|V^{IWJWZo@#0c!eZPCCFh@LOzs>-we+AxE>F}dsB z=W3_4vR^4UQXA^+^{MalVd0apZ?tqbPnYD|F{>3$Z8$XH=67?smVHEhdDb#K8?#LK zl|Td|ix^A<>Mhxt2KiX$Xt;f0=~m*8s^zNw2OgxvH;f{6Lhp->MOHG^da0znu!d1< zZ^RbJhjnMl_ck}$yJhjq5kNmf6oPXB*AXkiU~ikcS3z>Yo>|hW-r?3CSV&+zF2K8l zu{1WCU#53)o7XsABf~ubdbZf^wvOvHZ@N=s{5{76BQyBx>ojkYu(9oOeoNgKX3n{4 zakT4RNpmWR#A_N&y>E=zHZS-IgeC1JcAaU$kPvcI_U+>JJ)>I__QJSV z{OiLicZZmo##3^ezgF+;wr=CQU}xN(DTs&{APO&(-)3RX*%ok%H(z_pWk4)qgMvaN zq|Zk%vof5A?>f~+U9Nu79&O=lEm(uu&pZiztTJ&m&X}0)S`#U5w*?sj^(^9D$}!vx z0@GouFIQz|KE`RGlx$SKEQ@9E_077rTB6J68c27lX-a9$Dzdc9V3)<%74Bh%C0h)u<%$j9)n)D9rR6Re9KH1 zr14Wi&_}N5vCNTngmWF26uFS z^A0KFc7R2x@T_ZN6ms495DosXd>=VTvdnqn#6LT;Mm?g*<`F>ZejJ5V+deR0eYLkJv;*v33*UFG}};?Vq)8 z2FD6v`B~0}6@olX>h$^t#C}E+N`2kv6fPkjY6e<#tO2P5HdNKDBbNd|43wdO_!n>IOK3+L!ggS zI9Vw_uMjL#&YZFQ2amge@%}@-0mqq*TYEb4J8xOSG3Y38u>}8}Ikope&Lel0+YH!w z#}#v+ogVij{2mYDeQsZ(#r@8@{)t&98`c%*ajn>)-X-DRz36m81FHi9K}4}6h!B

AYstNy`B3ODq9Z~vu3 z#3k<-k~0yN`?O+rs^(FwRN#*SS{$6FV^%7lJPF#8?=*E&=|Zll`ZU;ji$J%G@F+iv zNQS4h-a_*C<+MK|+eV{zdKzU@Q;*H&b5qEn%Bg9Vh?Fw|`-h6p-Vma)UWEg!sSc83 zMyV(m0)T*0S*$cx@*prt0q7B^aPsU=)G;hLvqnR~g5tpsj<4Zo|J}rcybnw~nA24( z3+}r(!zg!_MYN>#{eX7E=n+@ex|LFXm9UkhWU{225rZ=E$ zKWqA78TgKLHfUc+D)bP`d7VB4mu?IHcFS0nhm99|7zGaA*ZWY8rK^0(#_ie;pAi0) zth)Jp<(VN=QJ;K>i6)H^sC_|-x(&A4NvA?5+I=pfk0)jH<};3D$+~>U@g<~Yzp)~F z$b3apIw}gOl8^0IkEdMbz5LK{Ey}c~8&yU~NIzLcSmXNMQHuzTX-uQ5V4ehsy@bcq z`6Vyg2VE1(U} RaT1+Cz3|FAX}!Oy`cDAYv4a2r literal 0 HcmV?d00001 diff --git a/app/build.gradle b/app/build.gradle index 0972b94..c3c3e73 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "ch.pizzapp.capri" minSdkVersion 16 targetSdkVersion 27 - versionCode 6 // play store'daki version : 5 - versionName "1.14" // play store'daki version : 1.13 + versionCode 5 // play store'daki version : 4 + versionName "2.1" // play store'daki version : 2.0 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/release/output.json b/app/release/output.json index 20a7cf2..0d530ea 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":6,"versionName":"1.14","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"2.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/ch/pizzapp/android/activity/BaseActivity.java b/app/src/main/java/ch/pizzapp/android/activity/BaseActivity.java index 843bb72..1f64ecd 100644 --- a/app/src/main/java/ch/pizzapp/android/activity/BaseActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/BaseActivity.java @@ -1,11 +1,17 @@ package ch.pizzapp.android.activity; +import android.annotation.TargetApi; import android.content.Context; +import android.os.Build; import android.os.Bundle; import android.os.PersistableBundle; import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; +import android.view.Window; +import android.view.WindowManager; +import ch.pizzapp.android.helper.DisplayHelper; import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper; /** @@ -20,6 +26,9 @@ public class BaseActivity extends AppCompatActivity { protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setCurrentActivity(this); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP){ + DisplayHelper.changeStatusColor(); + } } @Override @@ -36,4 +45,5 @@ public class BaseActivity extends AppCompatActivity { public static void setCurrentActivity(BaseActivity currentActivity) { BaseActivity.currentActivity = currentActivity; } + } diff --git a/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java b/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java index 39c9a36..70c42eb 100644 --- a/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java +++ b/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java @@ -34,7 +34,7 @@ public class DialogHelper { .title(title) .content(message) .titleColorRes(R.color.red) - .contentColorRes(R.color.navy) + .contentColorRes(R.color.black) .positiveText(R.string.ok) .positiveColor(ContextCompat.getColor(context, R.color.colorPrimary)) .onPositive(new MaterialDialog.SingleButtonCallback() { @@ -59,7 +59,7 @@ public class DialogHelper { .title(R.string.alert) .content(content) .titleColorRes(R.color.red) - .contentColorRes(R.color.navy) + .contentColorRes(R.color.black) .positiveText(R.string.ok) .positiveColor(ContextCompat.getColor(context, R.color.colorPrimary)) .typeface("Quicksand-Medium.ttf", "Quicksand-Regular.ttf") @@ -72,7 +72,7 @@ public class DialogHelper { .title(R.string.alert) .content(BaseActivity.currentActivity.getString(R.string.failed)) .titleColorRes(R.color.red) - .contentColorRes(R.color.navy) + .contentColorRes(R.color.black) .positiveText(R.string.ok) .positiveColor(ContextCompat.getColor(BaseActivity.currentActivity, R.color.colorPrimary)) .typeface("Quicksand-Medium.ttf", "Quicksand-Regular.ttf") @@ -85,7 +85,7 @@ public class DialogHelper { .title(R.string.alert) .content(BaseActivity.currentActivity.getString(R.string.no_network_message)) .titleColorRes(R.color.red) - .contentColorRes(R.color.navy) + .contentColorRes(R.color.black) .positiveText(R.string.ok) .positiveColor(ContextCompat.getColor(BaseActivity.currentActivity, R.color.colorPrimary)) .onPositive(new MaterialDialog.SingleButtonCallback() { @@ -104,7 +104,7 @@ public class DialogHelper { loadingDialog = new MaterialDialog.Builder(BaseActivity.currentActivity) .content(BaseActivity.currentActivity.getString(R.string.loading)) .titleColorRes(R.color.red) - .contentColorRes(R.color.navy) + .contentColorRes(R.color.black) .cancelable(false) .progress(true, 0) .progressIndeterminateStyle(true) @@ -141,7 +141,7 @@ public class DialogHelper { .title(R.string.alert) .content(message) .titleColorRes(R.color.red) - .contentColorRes(R.color.navy) + .contentColorRes(R.color.black) .positiveText(positiveTextResId) .onPositive(positiveButtonCallback) .negativeText(negativeTextResId) @@ -160,7 +160,7 @@ public class DialogHelper { .title(title) .content(message) .titleColorRes(R.color.red) - .contentColorRes(R.color.navy) + .contentColorRes(R.color.black) .positiveText(positiveTextResId) .onPositive(positiveButtonCallback) .negativeText(negativeTextResId) @@ -176,7 +176,7 @@ public class DialogHelper { .title(R.string.alert) .content(BaseActivity.currentActivity.getString(messageResourceId)) .titleColorRes(R.color.red) - .contentColorRes(R.color.navy) + .contentColorRes(R.color.black) .positiveText(R.string.button_login) .onPositive(new MaterialDialog.SingleButtonCallback() { @Override @@ -209,7 +209,7 @@ public class DialogHelper { .title(R.string.alert) .content(R.string.alert_update_app) .titleColorRes(R.color.red) - .contentColorRes(R.color.navy) + .contentColorRes(R.color.black) .positiveText(R.string.update_app) .positiveColor(ContextCompat.getColor(context, R.color.colorPrimary)) .cancelable(false) @@ -217,7 +217,7 @@ public class DialogHelper { @Override public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { Intent intent = new Intent(Intent.ACTION_VIEW); - intent.setData(Uri.parse("market://details?id=ch.pizzalink.android")); + intent.setData(Uri.parse("market://details?id=ch.pizzapp.capri")); BaseActivity.currentActivity.startActivity(intent); BaseActivity.currentActivity.finishAffinity(); } @@ -232,7 +232,7 @@ public class DialogHelper { .title(R.string.app_name) .content(message) .titleColorRes(R.color.red) - .contentColorRes(R.color.navy) + .contentColorRes(R.color.black) .positiveText(R.string.ok) .onPositive(singleButtonCallback) .typeface("Quicksand-Medium.ttf", "Quicksand-Regular.ttf") @@ -247,7 +247,7 @@ public class DialogHelper { .title(R.string.app_name) .content(R.string.password_reset) .titleColorRes(R.color.red) - .contentColorRes(R.color.navy) + .contentColorRes(R.color.black) .positiveText(R.string.ok) .positiveColor(ContextCompat.getColor(context, R.color.colorPrimary)) .cancelable(false) @@ -270,7 +270,7 @@ public class DialogHelper { .title(R.string.app_name) .content(R.string.profile_updated) .titleColorRes(R.color.red) - .contentColorRes(R.color.navy) + .contentColorRes(R.color.black) .positiveText(R.string.ok) .cancelable(false) .onPositive(singleButtonCallback) @@ -283,7 +283,7 @@ public class DialogHelper { new MaterialDialog.Builder(BaseActivity.currentActivity) .title(R.string.choose) .titleColorRes(R.color.red) - .contentColorRes(R.color.navy) + .contentColorRes(R.color.black) .items(itemList) .itemsCallback(listCallback) .typeface("Quicksand-Medium.ttf", "Quicksand-Regular.ttf") diff --git a/app/src/main/java/ch/pizzapp/android/helper/DisplayHelper.java b/app/src/main/java/ch/pizzapp/android/helper/DisplayHelper.java index 5ae1a69..935c261 100644 --- a/app/src/main/java/ch/pizzapp/android/helper/DisplayHelper.java +++ b/app/src/main/java/ch/pizzapp/android/helper/DisplayHelper.java @@ -39,6 +39,6 @@ public class DisplayHelper { Window window = BaseActivity.currentActivity.getWindow(); window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); - window.setStatusBarColor(ContextCompat.getColor(BaseActivity.currentActivity, R.color.navy)); + window.setStatusBarColor(ContextCompat.getColor(BaseActivity.currentActivity, R.color.main_black)); } } diff --git a/app/src/main/res/drawable/background_button_cart.xml b/app/src/main/res/drawable/background_button_cart.xml index 950361d..fd39a38 100644 --- a/app/src/main/res/drawable/background_button_cart.xml +++ b/app/src/main/res/drawable/background_button_cart.xml @@ -4,12 +4,12 @@ android:shape="oval"> - + + android:color="@color/main_black" /> + app:titleTextColor="@color/black" />