diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 7b0cf03..bea1b0a 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index e2f7590..b079200 100644 Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ diff --git a/Capri.jks b/Capri.jks deleted file mode 100644 index 878cd92..0000000 Binary files a/Capri.jks and /dev/null differ diff --git a/app/build.gradle b/app/build.gradle index b8a5480..b3573bd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,9 +7,9 @@ buildscript { } } +apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin' apply plugin: 'com.android.application' apply plugin: 'io.fabric' -apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin' repositories { maven { url 'https://maven.fabric.io/public' } @@ -22,8 +22,8 @@ android { applicationId "ch.pizzamaxx.android" minSdkVersion 16 targetSdkVersion 28 - versionCode 26 // play store'daki version --> canlı: 25 - dahili test: 24 - versionName "2.28" // play store'daki version --> canlı: 2.27 - dahili test: 2.26 + versionCode 2 // play store'daki version --> canlı: - dahili test: 1 + versionName "1.01" // play store'daki version --> canlı: - dahili test: 1.00 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true manifestPlaceholders = [ diff --git a/app/release/output.json b/app/release/output.json index be32f2f..1b9fd04 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":25,"versionName":"2.27","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":1,"versionName":"1.00","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/pizzamaxx/android/activity/MainActivity.java b/app/src/main/java/ch/pizzamaxx/android/activity/MainActivity.java index 5bf4a49..b548cce 100644 --- a/app/src/main/java/ch/pizzamaxx/android/activity/MainActivity.java +++ b/app/src/main/java/ch/pizzamaxx/android/activity/MainActivity.java @@ -166,7 +166,7 @@ public class MainActivity extends BaseActivity { bottomNavigationView.setCurrentItem(2); } else { - openProductsScreen(categoryList.get(3)); + openProductsScreen(categoryList.get(0)); } } private void initBottomNavigationView(){ diff --git a/app/src/main/java/ch/pizzamaxx/android/api/ApiConstants.java b/app/src/main/java/ch/pizzamaxx/android/api/ApiConstants.java index 4883bef..1c7272d 100644 --- a/app/src/main/java/ch/pizzamaxx/android/api/ApiConstants.java +++ b/app/src/main/java/ch/pizzamaxx/android/api/ApiConstants.java @@ -5,7 +5,7 @@ public class ApiConstants { public static final int API_CONNECT_TIMEOUT = 10; //public static final String API_PATH = "http://www.pizzalink.ch/"; //public static final String API_PATH = "http://pizzapp.ddns.net/"; - public static final String API_PATH = "http://pizzapp.ch/"; + public static final String API_PATH = "http://pizzamaxx.ch/"; public static final int CATEGORY_ID_WUNSCHPIZZA = 9999; public static final int CATEGORY_ID_EKSTRA_KEBAP = 9998; public static final int PRODUCT_ID_WUNSCHPIZZA = 56; diff --git a/app/src/main/res/drawable/pizzamax_splash_logo.png b/app/src/main/res/drawable/pizzamax_splash_logo.png new file mode 100644 index 0000000..361837a Binary files /dev/null and b/app/src/main/res/drawable/pizzamax_splash_logo.png differ diff --git a/app/src/main/res/drawable/pizzapp_splash_logo.png b/app/src/main/res/drawable/pizzapp_splash_logo.png deleted file mode 100644 index a21d61a..0000000 Binary files a/app/src/main/res/drawable/pizzapp_splash_logo.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index 8c88670..405f6bd 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -20,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:src="@drawable/pizzapp_splash_logo" + android:src="@drawable/pizzamax_splash_logo" android:adjustViewBounds="true" android:layout_margin="16dp" android:scaleType="fitXY" /> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0530e8b..3820320 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,7 +1,7 @@ - Pizzamaxx + PizzaMaxx Es ist ein Fehler aufgetreten. Warnung Es ist ein Fehler aufgetreten. diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 6ca22e9..14b1cb2 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -16,7 +16,7 @@ #f15d51 #ffffff #4C4B4A - #232b2b + #231F20 #000000 #EBECEC #33ffffff diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index acfb66b..0b674bd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ - Pizzamaxx + PizzaMaxx Es ist ein Fehler aufgetreten. Warnung Es ist ein Fehler aufgetreten. diff --git a/pizzamaxx_jks b/pizzamaxx_jks new file mode 100644 index 0000000..2a2ed8e Binary files /dev/null and b/pizzamaxx_jks differ diff --git a/pizzamaxx_keystore.txt b/pizzamaxx_keystore.txt new file mode 100644 index 0000000..22f120e --- /dev/null +++ b/pizzamaxx_keystore.txt @@ -0,0 +1,5 @@ +keystore password : zuh07819 +key alias : pizzamaxx +key password :zuh07819 + +jks dosyası "pizzamaxx_jks" dosyası. Sonunda .jks uzantısı yok, bu sekilde üretti. Sonuna .jks eklenirse hata veriyor. diff --git a/pizzapp_keystore.txt b/pizzapp_keystore.txt deleted file mode 100644 index 20c466e..0000000 --- a/pizzapp_keystore.txt +++ /dev/null @@ -1,17 +0,0 @@ -keystore password : EnMkadcBsT26 -key alias : capri -key password : EnMkadcBsT26 - -jks dosyası "capri.jks" dosyası. - -Hintlilerin gönderdiği "Keystore.txt" dosyasında sadece sunlar yazıyordu: - - - -EnMkadcBsT26 - -Swiss-iApps - - - -keystore password olarak EnMkadcBsT26, key password olarak Swiss-iApps verince Build hata verdi. İkisine de EnMkadcBsT26 yazında kabul etti. \ No newline at end of file