fix(lint): fix issue in linting that would cause an error due to retr…

…ofit square/okio#58, also fixed some minor linting issues
Chesire · May 29, 2017 · 73293d2 · 73293d2
1 parent d2a044e
commit 73293d2
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 13 deletions.
diff --git a/EorzeanInfo/app/build.gradle b/EorzeanInfo/app/build.gradle
@@ -17,6 +17,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    lintOptions {
+        lintConfig rootProject.file('gradle/lint.xml')
+    }
 }
 
 dependencies {

diff --git a/EorzeanInfo/app/src/main/res/layout/activity_first_launch.xml b/EorzeanInfo/app/src/main/res/layout/activity_first_launch.xml
@@ -24,7 +24,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_margin="@dimen/default_half_margin"
         android:background="@null"
@@ -36,7 +35,6 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_margin="@dimen/default_half_margin"
         android:background="@null"
         android:text="@string/first_launch_next" />

diff --git a/EorzeanInfo/app/src/main/res/layout/fragment_character_achievements.xml b/EorzeanInfo/app/src/main/res/layout/fragment_character_achievements.xml
@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="https://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/holo_blue_dark"
     android:orientation="vertical">
 
 </LinearLayout>
diff --git a/EorzeanInfo/app/src/main/res/layout/fragment_character_search.xml b/EorzeanInfo/app/src/main/res/layout/fragment_character_search.xml
@@ -26,8 +26,6 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/character_search_name_input_layout"
         android:layout_marginEnd="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
         android:layout_marginStart="8dp"
         android:text="@string/search_data_centre_label" />
 
@@ -37,8 +35,8 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/character_search_data_centre_label"
         android:layout_marginBottom="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp" />
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/character_search_server_label"
@@ -47,8 +45,6 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/character_search_data_centre_selection"
         android:layout_marginEnd="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
         android:layout_marginStart="8dp"
         android:text="@string/search_server_label" />
 
@@ -58,8 +54,8 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/character_search_server_label"
         android:layout_marginBottom="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp" />
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp" />
 
     <ProgressBar
         android:id="@+id/character_search_progress_indicator"

diff --git a/EorzeanInfo/app/src/main/res/layout/item_character_select_cardview.xml b/EorzeanInfo/app/src/main/res/layout/item_character_select_cardview.xml
@@ -41,6 +41,6 @@
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_alignParentTop="true"
-            android:text="*" />
+            android:text="@string/select_character_current" />
     </RelativeLayout>
 </android.support.v7.widget.CardView>
diff --git a/EorzeanInfo/app/src/main/res/values/strings.xml b/EorzeanInfo/app/src/main/res/values/strings.xml
@@ -2,7 +2,6 @@
     <string name="app_name">Eorzean Info</string>
 
     <string name="search_character_name">Character Name</string>
-    <string name="search_character_server">Server</string>
     <string name="search_data_centre_label">Data Centre</string>
     <string name="search_server_label">Server</string>
     <string name="search_search_button">Search</string>
@@ -21,6 +20,7 @@
 
     <string name="select_character_title">Select Character</string>
     <string name="select_character_no_characters_found">No characters found, please add a character to begin</string>
+    <string name="select_character_current">*</string>
 
     <string name="updating_currently_updating">Character details are currently updating…</string>
 

diff --git a/EorzeanInfo/gradle/lint.xml b/EorzeanInfo/gradle/lint.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="InvalidPackage">
+        <ignore regexp=".*okio.*" />
+        <ignore regexp=".*retrofit.*" />
+    </issue>
+</lint>