telefonnumer text changed and libraries updated

This commit is contained in:
2019-02-06 21:53:12 +03:00
parent 849c67c3c2
commit ec2b85adaa
10 changed files with 55 additions and 27 deletions

View File

@@ -17,12 +17,11 @@ repositories {
}
android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
compileSdkVersion 28
defaultConfig {
applicationId "ch.pizzapp.capri"
minSdkVersion 16
targetSdkVersion 27
targetSdkVersion 28
versionCode 25 // play store'daki version --> canlı: 21 - dahili test: 24
versionName "2.27" // play store'daki version --> canlı: 2.23 - dahili test: 2.26
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -42,38 +41,46 @@ android {
}
dependencies {
def appcompat_version = "28.0.0"
def play_services_version_general = "16.0.1"
def play_services_version_for_maps_and_locations = "16.0.0"
def retrofit_version = "2.3.0"
def okhttp_version = "3.9.1"
def butterknife_version = "8.8.1"
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation "com.android.support:support-compat:27.1.1"
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support:support-v13:27.1.1'
implementation 'com.android.support:recyclerview-v7:27.1.1'
implementation 'com.android.support:cardview-v7:27.1.1'
implementation "com.android.support:support-compat:$appcompat_version"
implementation "com.android.support:appcompat-v7:$appcompat_version"
implementation "com.android.support:design:$appcompat_version"
implementation "com.android.support:support-v13:$appcompat_version"
implementation "com.android.support:recyclerview-v7:$appcompat_version"
implementation "com.android.support:cardview-v7:$appcompat_version"
implementation 'com.android.support:multidex:1.0.3'
implementation 'com.google.android.gms:play-services-base:15.0.1'
implementation 'com.google.android.gms:play-services-location:15.0.1'
implementation 'com.google.android.gms:play-services-wallet:15.0.1'
implementation "com.google.android.gms:play-services-base:$play_services_version_general"
implementation "com.google.android.gms:play-services-location:$play_services_version_for_maps_and_locations"
implementation "com.google.android.gms:play-services-wallet:$play_services_version_general"
implementation 'com.google.firebase:firebase-messaging:17.3.0'
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
implementation 'com.squareup.picasso:picasso:2.5.2'
implementation 'com.squareup.okhttp3:okhttp:3.9.1'
implementation 'com.squareup.okhttp3:logging-interceptor:3.9.1'
implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
implementation "com.squareup.okhttp3:logging-interceptor:$okhttp_version"
implementation 'com.jakewharton:butterknife:8.8.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
implementation "com.jakewharton:butterknife:$butterknife_version"
annotationProcessor "com.jakewharton:butterknife-compiler:$butterknife_version"
implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
implementation 'com.github.AndroidDeveloperLB:DialogShard:3'
implementation 'com.github.HITGIF:TextFieldBoxes:1.3.3'
implementation 'com.github.ittianyu:BottomNavigationViewEx:1.2.4'
implementation 'com.github.ittianyu:BottomNavigationViewEx:2.0.2' // for support library 28, use that version
implementation 'com.github.bumptech.glide:glide:4.5.0'
implementation 'com.github.badoualy:stepper-indicator:1.0.7'
implementation 'io.github.luizgrp.sectionedrecyclerviewadapter:sectionedrecyclerviewadapter:1.1.3'

View File

@@ -37,4 +37,8 @@
<attr name="dropdownHintView" format="string" />
</declare-styleable>
<declare-styleable name="foo">
<attr name="textColorError" format="color" />
</declare-styleable>
</resources>

View File

@@ -61,7 +61,7 @@
<string name="activity_title_register">Registrieren</string>    
<string name="firstname">Vorname</string>    
<string name="lastname">Nachname</string>    
<string name="telephone">Telefonnummer</string>    
<string name="telephone">Natal</string>    
<string name="email">E-Mail-Adresse</string>    
<string name="password">Passwort</string>    
<string name="password_again">Passwort (erneut eingeben)</string>    
@@ -201,7 +201,7 @@
<string name="pizza_pass">PIZZA PASS</string>    
<string name="profile_firstname">VORNAME</string>    
<string name="profile_lastname">NACHNAME</string>    
<string name="profile_telephone">TELEFONNUMMER</string>    
<string name="profile_telephone">NATAL</string>    
<string name="profile_email">E-MAIL-ADRESSE</string>    
<string name="my_addresses">Meine Adressen</string>    
<string name="update_profile">Profil Aktualisieren</string>    

View File

@@ -86,4 +86,8 @@
<item name="android:textAllCaps">false</item>
</style>
<style name="foo">
<item name="textColorError">@color/colorPrimary</item>
</style>
</resources>