fix tests

IlyaEremin · Jan 22, 2017 · 640d6da · 640d6da
1 parent dd6f8fd
commit 640d6da
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 19 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,7 +6,7 @@ apply from: 'checkstyle/checkstyle.gradle'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.0"
+    buildToolsVersion "25.0.1"
     defaultConfig {
         applicationId "com.example.ereminilya.drive2_ok"
         minSdkVersion 16
@@ -42,6 +42,7 @@ android {
 ext {
     nytimesStore = '1.0.4'
     conductor = '2.0.7'
+    support = '25.1.0'
 }
 
 dependencies {
@@ -53,16 +54,15 @@ dependencies {
     compile "com.nytimes.android:store:$nytimesStore"
     compile "com.nytimes.android:middleware:$nytimesStore"
 
-    compile 'com.android.support:appcompat-v7:25.0.0'
-    compile "com.android.support:recyclerview-v7:25.0.0"
+    compile "com.android.support:appcompat-v7:$support"
+    compile "com.android.support:recyclerview-v7:$support"
 
     compile "com.squareup.retrofit2:retrofit:2.1.0"
     compile "com.squareup.retrofit2:adapter-rxjava:2.1.0"
     compile "com.squareup.retrofit2:converter-gson:2.1.0"
     compile "com.squareup.okhttp3:logging-interceptor:3.4.1"
     compile 'io.reactivex:rxandroid:1.2.1'
     compile 'com.github.bumptech.glide:glide:3.7.0'
-    compile 'com.android.support:cardview-v7:25.0.0'
 
     compile "com.bluelinelabs:conductor:$conductor"
     compile "com.bluelinelabs:conductor-rxlifecycle:$conductor"

diff --git a/app/lint.xml b/app/lint.xml
@@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
-    <issue id="IconExpectedSize" severity="fatal"/>
-    <issue id="UseCompoundDrawables" severity="ignore"/>
-    <issue id="ContentDescription" severity="ignore"/>
-    <issue id="GoogleAppIndexingWarning" severity="ignore"/>
+    <issue id="IconExpectedSize" severity="fatal" />
+    <issue id="UseCompoundDrawables" severity="ignore" />
+    <issue id="ContentDescription" severity="ignore" />
+    <issue id="GoogleAppIndexingWarning" severity="ignore" />
     <issue id="InvalidPackage">
-        <ignore regexp="okio-1.9.0.jar"/>
-        <ignore regexp="retrofit-2.1.0.jar"/>
+        <ignore regexp="okio-1.11.0.jar" />
+        <ignore regexp="retrofit-2.1.0.jar" />
     </issue>
-    <issue id="NewApi" severity="informational"/>
-    <issue id="GradleDependency" severity="informational"/>
-    <issue id="Overdraw" severity="ignore"/>
+    <issue id="NewApi" severity="informational" />
+    <issue id="GradleDependency" severity="informational" />
+    <issue id="Overdraw" severity="ignore" />
+    <issue id="UnusedResources" severity="ignore">
+        <ignore path="res/lancer.png" />
+    </issue>
+    <issue id="IconMissingDensityFolder" severity="ignore">
+        <ignore path="res/drawable-mdpi" />
+        <ignore path="res/drawable-xxxhdpi" />
+    </issue>
+
 </lint>
diff --git a/app/src/main/java/com/example/ereminilya/drive2_ok/UserInteractor.java b/app/src/main/java/com/example/ereminilya/drive2_ok/UserInteractor.java
@@ -22,12 +22,12 @@
 
 public class UserInteractor {
 
-    private static final String KEY_USER = "user";
-    private static final String KEY_CARS = "cars";
-
     public static final Type CARS_LIST = new TypeToken<ArrayList<Car>>() {
     }.getType();
 
+    private static final String KEY_USER = "user";
+    private static final String KEY_CARS = "cars";
+
     private final Storage storage;
     private final Api     api;
 

diff --git a/app/src/main/java/com/example/ereminilya/drive2_ok/login/LoginScreen.java b/app/src/main/java/com/example/ereminilya/drive2_ok/login/LoginScreen.java
@@ -3,7 +3,6 @@
 import android.app.ProgressDialog;
 import android.support.annotation.Nullable;
 import android.widget.EditText;
-import android.widget.Toast;
 
 import com.bluelinelabs.conductor.RouterTransaction;
 import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler;
@@ -64,7 +63,6 @@ public class LoginScreen extends BaseController {
                 );
             }, error -> {
                 // TODO parse error
-                Toast.makeText(LoginScreen.this.getActivity(), "Svisni v hyi", Toast.LENGTH_SHORT).show();
             });
     }
 

diff --git a/app/src/main/res/layout/screen_profile.xml b/app/src/main/res/layout/screen_profile.xml
@@ -21,6 +21,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
         android:layout_marginTop="8dp"
         android:textAppearance="@style/TextAppearance.AppCompat.Headline"
         tools:text="Ilya Eremin"
@@ -30,6 +31,7 @@
         android:id="@+id/city"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginRight="16dp"
         android:layout_marginLeft="16dp"
         android:layout_marginTop="4dp"
         tools:text="Kazan"
@@ -38,6 +40,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginRight="16dp"
         android:layout_marginLeft="16dp"
         android:layout_marginTop="12dp"
         android:text="@string/profile_my_cars"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -10,6 +10,6 @@
     <string name="loading">Пожалуйста, подождите</string>
     <string name="login_progress">Входим…</string>
     <string name="profile_my_cars">Мои машины:</string>
-    <string name="profile_no_cars">Пока нет...</string>
+    <string name="profile_no_cars">Пока нет…</string>
 
 </resources>