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

app part 2

Browse Source
This commit is contained in:
cimenmus
2019-03-22 00:22:13 +03:00
parent 9ffa250afa
commit 03ff6d458b
16 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/caches/build_file_checksums.ser
Generated
BIN
View File
Binary file not shown.
.idea/caches/gradle_models.ser
Generated
BIN
View File
Binary file not shown.
Capri.jks
BIN
View File
Binary file not shown.
app/build.gradle
+3 -3
View File
@@ -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 = [
app/release/output.json
+1 -1
View File
@@ -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":{}}]
[{"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":{}}]
app/src/main/java/ch/pizzamaxx/android/activity/MainActivity.java
+1 -1
View File
@@ -166,7 +166,7 @@ public class MainActivity extends BaseActivity {
bottomNavigationView.setCurrentItem(2);
}
else {
openProductsScreen(categoryList.get(3));
openProductsScreen(categoryList.get(0));
}
}
private void initBottomNavigationView(){
app/src/main/java/ch/pizzamaxx/android/api/ApiConstants.java
+1 -1
View File
@@ -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;
app/src/main/res/drawable/pizzamax_splash_logo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 42 KiB

app/src/main/res/drawable/pizzapp_splash_logo.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 66 KiB

app/src/main/res/layout/activity_splash.xml
+1 -1
View File
@@ -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" />
app/src/main/res/values-fr/strings.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<resources>
<!-- General-->
<string name="app_name">Pizzamaxx</string>
<string name="app_name">PizzaMaxx</string>
<string name="something_went_wrong">Es ist ein Fehler aufgetreten.</string>
<string name="alert">Warnung</string>
<string name="error_message">Es ist ein Fehler aufgetreten.</string>
app/src/main/res/values/colors.xml
+1 -1
View File
@@ -16,7 +16,7 @@
<color name="bottom_menu_selected_item">#f15d51</color>
<color name="bottom_menu_unselected_item">#ffffff</color>
<color name="navigation_drawer_background">#4C4B4A</color>
<color name="main_black">#232b2b</color>
<color name="main_black">#231F20</color><!--#232b2b-->
<color name="black">#000000</color>
<color name="row_product_ingredients_background">#EBECEC</color>
<color name="transparent_white">#33ffffff</color>
app/src/main/res/values/strings.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<resources>
<!-- General-->
<string name="app_name">Pizzamaxx</string>
<string name="app_name">PizzaMaxx</string>
<string name="something_went_wrong">Es ist ein Fehler aufgetreten.</string>
<string name="alert">Warnung</string>
<string name="error_message">Es ist ein Fehler aufgetreten.</string>
pizzamaxx_jks
BIN
View File
Binary file not shown.
pizzamaxx_keystore.txt
+5
View File
@@ -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.
pizzapp_keystore.txt
-17
View File
@@ -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.