telefonnumer text changed and libraries updated

2019-02-06 21:53:12 +03:00
parent 849c67c3c2
commit ec2b85adaa
10 changed files with 55 additions and 27 deletions
--- a/.idea/caches/build_file_checksums.ser
+++ b/.idea/caches/build_file_checksums.ser
--- a/.idea/caches/gradle_models.ser
+++ b/.idea/caches/gradle_models.ser
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,6 +3,9 @@
  <component name="GradleSettings">
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
        <option name="distributionType" value="DEFAULT_WRAPPED" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
        <option name="modules">
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,22 +5,32 @@
    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
    <option name="myNullables">
      <value>
-        <list size="5">
+        <list size="10">
          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
        </list>
      </value>
    </option>
    <option name="myNotNulls">
      <value>
-        <list size="4">
+        <list size="9">
          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
        </list>
      </value>
    </option>
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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'
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -37,4 +37,8 @@
        <attr name="dropdownHintView" format="string" />
    </declare-styleable>

+    <declare-styleable name="foo">
+        <attr name="textColorError" format="color" />
+    </declare-styleable>
+
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -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>    
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -86,4 +86,8 @@
        <item name="android:textAllCaps">false</item>
    </style>

+    <style name="foo">
+        <item name="textColorError">@color/colorPrimary</item>
+    </style>
+
 </resources>
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
        maven { url 'https://maven.fabric.io/public' }
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.3.0'
        classpath 'io.fabric.tools:gradle:1.+'

        // NOTE: Do not place your application dependencies here; they belong
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat May 26 11:48:18 EET 2018
+#Wed Feb 06 21:08:58 EET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip