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

app publish

Browse Source
This commit is contained in:
cimenmus
2018-08-22 13:29:52 +03:00
parent 68c216127d
commit a1efc268eb
6 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

4
app/build.gradle
View File

@@ -12,8 +12,8 @@ android {
applicationId "ch.pizzapp.capri" applicationId "ch.pizzapp.capri"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 27 targetSdkVersion 27
versionCode 10 // play store'daki version --> canlı: 8 - dahili test: 6 versionCode 11 // play store'daki version --> canlı: 8 - dahili test: 10
versionName "2.12" // play store'daki version --> canlı: 2.1 - dahili test: 2.11 versionName "2.13" // play store'daki version --> canlı: 2.1 - dahili test: 2.12
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {

2
app/release/output.json
View File

@@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":9,"versionName":"2.11","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] [{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"2.12","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

13
app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java
View File

@@ -65,9 +65,8 @@ public class CartFragment extends BaseFragment {
@BindString(R.string.alert_remove_prdocut_from_cart) String removeProdcutFromCartAlert; @BindString(R.string.alert_remove_prdocut_from_cart) String removeProdcutFromCartAlert;
@BindString(R.string.product_removed_from_cart) String productRemovedFromCartText; @BindString(R.string.product_removed_from_cart) String productRemovedFromCartText;
@BindString(R.string.alert_clear_cart) String clearCartAlertText; @BindString(R.string.alert_clear_cart) String clearCartAlertText;
@BindString(R.string.minimum_order_price_alert) String minimumOrderPriceAlertText; @BindString(R.string.minimum_order_price_alert_part_1) String minimumOrderPriceAlertPart1Text;
@BindString(R.string.minimum_order_price) String minimumOrderPriceText; @BindString(R.string.minimum_order_price_alert_part_2) String minimumOrderPriceAlertPart2Text;
@BindColor(R.color.actvity_default_background_color_1) int grayColor; @BindColor(R.color.actvity_default_background_color_1) int grayColor;
@BindColor(R.color.white) int whiteColor; @BindColor(R.color.white) int whiteColor;
@@ -133,11 +132,11 @@ public class CartFragment extends BaseFragment {
else { else {
String dialogText = String dialogText =
new StringBuilder() new StringBuilder()
.append(minimumOrderPriceAlertText) .append(minimumOrderPriceAlertPart1Text)
.append("\n")
.append(minimumOrderPriceText)
.append(" ") .append(" ")
.append(PriceHelper.getPriceWithCurreny(storeMinimumPrice)) .append(SessionHelper.getSelectedStore().getMinimumPrice())
.append(" ")
.append(minimumOrderPriceAlertPart2Text)
.toString(); .toString();
DialogHelper.showAlertDialog( DialogHelper.showAlertDialog(

4
app/src/main/java/ch/pizzapp/android/helper/PriceHelper.java
View File

@@ -23,6 +23,10 @@ public class PriceHelper {
return BaseActivity.currentActivity.getString(R.string.chf) + " " + priceString; return BaseActivity.currentActivity.getString(R.string.chf) + " " + priceString;
} }
public static String getPriceWithCurrenyAndFractions(Double price){
return BaseActivity.currentActivity.getString(R.string.chf) + " " + price;
}
public static String removeCurrencyFromPrice(String priceWithCurreny){ public static String removeCurrencyFromPrice(String priceWithCurreny){
/* /*
try { try {

6
app/src/main/res/values/strings.xml
View File

@@ -34,7 +34,7 @@
<string name="no_network_message">Keine Internetverbindung. Bitte versuchen Sie es später noch einmal.</string> <string name="no_network_message">Keine Internetverbindung. Bitte versuchen Sie es später noch einmal.</string>
<string name="alert_update_app">Sie müssen die Pizzalink-Applikation aktualisieren, um sie zu verwenden.</string> <string name="alert_update_app">Sie müssen die Pizzalink-Applikation aktualisieren, um sie zu verwenden.</string>
<string name="update_app">AKTUALISIEREN</string> <string name="update_app">AKTUALISIEREN</string>
<string name="choose_store">Posta Kodu Seçin</string> <string name="choose_store">Wählen Sie Postleitzahl</string>
<!-- SplashActivity --> <!-- SplashActivity -->
<!-- LoginActivity--> <!-- LoginActivity-->
@@ -104,8 +104,8 @@
         
<string name="product_removed_from_cart">Produkt wurde aus dem Warenkorb entfernt.</string>     <string name="product_removed_from_cart">Produkt wurde aus dem Warenkorb entfernt.</string>    
<string name="alert_clear_cart">Möchten Sie alle Produkte aus dem Warenkorb entfernen?</string> <string name="alert_clear_cart">Möchten Sie alle Produkte aus dem Warenkorb entfernen?</string>
<string name="minimum_order_price_alert">Minimum tutarın altında sipariş veremezsiniz.</string> <string name="minimum_order_price_alert_part_1">Die Summe Ihres Warenkorbes muss mindestens</string>
<string name="minimum_order_price">Minimum Sipariş Tutarı:</string> <string name="minimum_order_price_alert_part_2">betragen, um die Bestellung auszuführen.</string>
<!-- CartFragment--> <!-- CartFragment-->
<!-- OrderHistoryFragment--> <!-- OrderHistoryFragment-->