V1.12 Fixing Lint warnings

jamesmorgan · Apr 1, 2012 · 71f8ae6 · 71f8ae6
1 parent fdbe9ae
commit 71f8ae6
Show file tree

Hide file tree

Showing 17 changed files with 99 additions and 60 deletions.
diff --git a/.classpath b/.classpath
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="src" output="bin/classes" path="gen">
@@ -12,5 +10,6 @@
 	<classpathentry kind="src" output="bin/classes" path="src/main/java"/>
 	<classpathentry kind="src" output="bin/classes" path="src/test/java"/>
 	<classpathentry kind="src" output="bin/classes" path="src/test/resources"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:installLocation="auto"
     package="com.morgan.design.weatherslider"
+    android:installLocation="auto"
     android:versionCode="12"
     android:versionName="1.12" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <!-- <uses-permission android:name="android.permission.READ_LOGS" />  -->
+    <!-- <uses-permission android:name="android.permission.READ_LOGS" /> -->
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 
-    <uses-sdk android:minSdkVersion="8" android:maxSdkVersion="14"/>
+    <uses-sdk
+        android:maxSdkVersion="14"
+        android:minSdkVersion="8"
+        android:targetSdkVersion="8" />
 
     <!-- android:debuggable="true" -->
     <application
@@ -76,7 +79,6 @@
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
-
         <activity
             android:name="com.morgan.design.android.TwoDayOverviewActivity"
             android:configChanges="keyboardHidden|orientation"
@@ -87,6 +89,7 @@
         <service
             android:name="com.morgan.design.android.service.LocationLookupService"
             android:enabled="true"
+            android:exported="false"
             android:label="@string/get_my_location_service" >
             <intent-filter>
                 <action android:name="com.morgan.design.android.service.GET_ROAMING_LOCATION_LOOKUP" />
@@ -121,7 +124,8 @@
         <!-- Service deals with all common tasks related to controlling notifications -->
         <service
             android:name="com.morgan.design.android.service.NotificationControllerService"
-            android:enabled="true" >
+            android:enabled="true"
+            android:exported="false" >
             <intent-filter>
                 <action android:name="com.morgan.design.android.broadcast.PREFERENCES_UPDATED" />
             </intent-filter>

diff --git a/assets/changelog.html b/assets/changelog.html
@@ -33,6 +33,25 @@
 			</tbody>
 		</table>
 
+		<h3>---- 1.12 - 1st April 2012</h3>
+		<table style="text-align: left;" border="0" cellpadding="2"
+			cellspacing="2">
+			<tbody>
+				<tr>
+					<td style="text-align: center; vertical-align: top;">+</td>
+					<td>Sync Version code and Number</td>
+				</tr>
+				<tr>
+					<td style="text-align: center; vertical-align: top;">+</td>
+					<td>Updated License</td>
+				</tr>
+				<tr>
+					<td style="text-align: center; vertical-align: top;">!</td>
+					<td>Default Weather text Summary disabled</td>
+				</tr>
+			</tbody>
+		</table>
+
 		<h3>---- 1.10 - 18th March 2012</h3>
 		<table style="text-align: left;" border="0" cellpadding="2"
 			cellspacing="2">

diff --git a/gen/com/morgan/design/weatherslider/R.java b/gen/com/morgan/design/weatherslider/R.java
@@ -349,25 +349,25 @@ public static final class id {
         public static final int SpinnerFeedbackType=0x7f090011;
         public static final int TextViewTitle=0x7f09000e;
         public static final int add_new_location=0x7f09002c;
-        public static final int additionaal_details_container=0x7f090039;
+        public static final int additionaal_details_container=0x7f090038;
         public static final int alwaysUseGpsButton=0x7f09000c;
-        public static final int country=0x7f09004d;
+        public static final int country=0x7f09004c;
         public static final int dummy_focus_container=0x7f090004;
         public static final int forecast_container=0x7f09001d;
-        public static final int further_details_container=0x7f090043;
+        public static final int further_details_container=0x7f090042;
         public static final int getMyLocationButton=0x7f090008;
-        public static final int home_menu_about=0x7f090051;
-        public static final int home_menu_cancel_all=0x7f090052;
-        public static final int home_menu_changelog=0x7f090050;
-        public static final int home_menu_create_shortcut=0x7f090054;
-        public static final int home_menu_feedback=0x7f09004f;
-        public static final int home_menu_reload_all=0x7f090053;
-        public static final int home_menu_settings=0x7f09004e;
-        public static final int humidity=0x7f09003b;
-        public static final int image=0x7f090048;
-        public static final int last_time_updated=0x7f09004a;
-        public static final int last_updated_date_time=0x7f090042;
-        public static final int layout=0x7f090046;
+        public static final int home_menu_about=0x7f090050;
+        public static final int home_menu_cancel_all=0x7f090051;
+        public static final int home_menu_changelog=0x7f09004f;
+        public static final int home_menu_create_shortcut=0x7f090053;
+        public static final int home_menu_feedback=0x7f09004e;
+        public static final int home_menu_reload_all=0x7f090052;
+        public static final int home_menu_settings=0x7f09004d;
+        public static final int humidity=0x7f09003a;
+        public static final int image=0x7f090047;
+        public static final int last_time_updated=0x7f090049;
+        public static final int last_updated_date_time=0x7f090041;
+        public static final int layout=0x7f090045;
         public static final int list_complex_caption=0x7f090017;
         public static final int list_complex_image=0x7f090015;
         public static final int list_complex_sub_caption=0x7f090018;
@@ -376,32 +376,31 @@ public static final class id {
         public static final int list_header_title=0x7f09001a;
         public static final int list_simple_title=0x7f09001b;
         public static final int list_simple_version=0x7f09001c;
-        public static final int location=0x7f090047;
+        public static final int location=0x7f090046;
         public static final int locationText=0x7f090005;
-        public static final int location_a=0x7f090031;
-        public static final int location_b=0x7f090032;
-        public static final int location_lat_long=0x7f090038;
+        public static final int location_a=0x7f090030;
+        public static final int location_b=0x7f090031;
+        public static final int location_lat_long=0x7f090037;
         public static final int lookUpLocationButton=0x7f090006;
         public static final int lookup_location_container=0x7f090007;
-        public static final int main_temperature=0x7f090037;
-        public static final int more_information_link=0x7f090044;
-        public static final int name=0x7f09004b;
-        public static final int open_map_link=0x7f090045;
-        public static final int overview_menu_feedback=0x7f090056;
-        public static final int overview_menu_home=0x7f090057;
-        public static final int overview_menu_settings=0x7f090055;
-        public static final int pressure=0x7f09003c;
-        public static final int secondary_text=0x7f09004c;
+        public static final int main_temperature=0x7f090036;
+        public static final int more_information_link=0x7f090043;
+        public static final int name=0x7f09004a;
+        public static final int open_map_link=0x7f090044;
+        public static final int overview_menu_feedback=0x7f090055;
+        public static final int overview_menu_home=0x7f090056;
+        public static final int overview_menu_settings=0x7f090054;
+        public static final int pressure=0x7f09003b;
+        public static final int secondary_text=0x7f09004b;
         public static final int service_update_area=0x7f09002e;
         public static final int service_update_area_container=0x7f09002d;
-        public static final int service_update_progress_bar=0x7f090030;
-        public static final int service_update_spinner=0x7f09002f;
-        public static final int sun_rise=0x7f090040;
-        public static final int sun_set=0x7f090041;
+        public static final int service_update_progress_bar=0x7f09002f;
+        public static final int sun_rise=0x7f09003f;
+        public static final int sun_set=0x7f090040;
         public static final int swipe_right_icon=0x7f09002a;
-        public static final int tableLayout1=0x7f090033;
-        public static final int tableRow1=0x7f090034;
-        public static final int temperature=0x7f09003a;
+        public static final int tableLayout1=0x7f090032;
+        public static final int tableRow1=0x7f090033;
+        public static final int temperature=0x7f090039;
         public static final int text=0x7f090003;
         public static final int textView1=0x7f090001;
         public static final int textView2=0x7f09000b;
@@ -421,12 +420,12 @@ public static final class id {
         public static final int top_container=0x7f09002b;
         public static final int use_gps=0x7f09000a;
         public static final int use_gps_location_container=0x7f090009;
-        public static final int weather_description=0x7f090035;
-        public static final int weather_image=0x7f090036;
-        public static final int weather_text=0x7f090049;
-        public static final int wind_chill=0x7f09003d;
-        public static final int wind_direction=0x7f09003f;
-        public static final int wind_speed=0x7f09003e;
+        public static final int weather_description=0x7f090034;
+        public static final int weather_image=0x7f090035;
+        public static final int weather_text=0x7f090048;
+        public static final int wind_chill=0x7f09003c;
+        public static final int wind_direction=0x7f09003e;
+        public static final int wind_speed=0x7f09003d;
         public static final int wv_dialog=0x7f090000;
     }
     public static final class layout {

diff --git a/lint.xml b/lint.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
     <issue id="ContentDescription" severity="ignore" />
-    <issue id="HardcodedText" severity="ignore" />
 </lint>
diff --git a/pom.xml b/pom.xml
@@ -250,7 +250,7 @@
 				<enabled>true</enabled>
 			</releases>
 			<snapshots>
-				<enabled>false</enabled>
+				<enabled>true</enabled>
 			</snapshots>
 		</repository>
 

diff --git a/res/layout/two_day_overview.xml b/res/layout/two_day_overview.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:fillViewport="true" >
+    android:fillViewport="true"
+    tools:ignore="HardcodedText" >
 
     <LinearLayout
         android:layout_width="match_parent"

diff --git a/res/layout/weather_choice_layout.xml b/res/layout/weather_choice_layout.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    tools:ignore="HardcodedText" >
 
     <LinearLayout
         android:id="@+id/top_container"
@@ -50,7 +52,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
-            android:layout_toLeftOf="@+id/service_update_spinner"
+            android:layout_toLeftOf="@+id/service_update_progress_bar"
             android:background="@drawable/rounded_corners"
             android:gravity="center_vertical|center_horizontal"
             android:text="Some update..."

diff --git a/res/layout/weather_overview.xml b/res/layout/weather_overview.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
+    android:layout_height="fill_parent"
+    tools:ignore="HardcodedText" >
 
     <RelativeLayout
         android:layout_width="fill_parent"

diff --git a/res/layout/woeid_choice_adaptor_layout.xml b/res/layout/woeid_choice_adaptor_layout.xml
@@ -1,9 +1,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    android:padding="10dp" >
+    android:padding="10dp"
+    tools:ignore="HardcodedText" >
 
     <TextView
         android:id="@+id/location"

diff --git a/res/layout/woied_rowlayout.xml b/res/layout/woied_rowlayout.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    tools:ignore="HardcodedText" >
 
     <TextView
         android:id="@+id/name"

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -170,5 +170,5 @@
     <string name="toast_unable_to_find_the_weather_for_your_location">Unable to find the weather for your location, please try agin.</string>
     <string name="update_checker_alert">An update for is available!\n\nOpen Android Market and see the details?</string>
     <string name="update_available">Update Available</string>
-
+    
 </resources>
diff --git a/src/main/java/com/morgan/design/TODO.java b/src/main/java/com/morgan/design/TODO.java
@@ -139,8 +139,10 @@ private TODO() {
 	 * Running tests - http://wiebe-elsinga.com/blog/?p=365
 	 */
 
+	// FIXME -> DONE - (01/04/2012) - Fixing Lint warnings
 	// FIXME -> DONE - (26/03/2012) - Update ORMLite to 4.38
 	// FIXME -> DONE - (26/03/2012) - Added license to GNU GPLv3
+	// FIXME -> DONE - (26/03/2012) - Sync Version Name and Version Code
 
 	// FIXME -> DONE - (25/03/2012) - House Work - Update Maven to latest version 3.0.4
 	// FIXME -> DONE - (25/03/2012) - House Work - Update Java to latest version 1.6_u31

diff --git a/src/main/java/com/morgan/design/WeatherSliderApplication.java b/src/main/java/com/morgan/design/WeatherSliderApplication.java
@@ -23,6 +23,7 @@
 import org.acra.ReportingInteractionMode;
 import org.acra.annotation.ReportsCrashes;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Application;
 import android.app.Service;
@@ -52,6 +53,7 @@ public class WeatherSliderApplication extends Application {
 
 	private GoogleAnalyticsService googleAnalyticsService;
 
+	@SuppressLint("UseSparseArrays")
 	private static Map<Integer, YahooWeatherInfo> WEATHERS = new HashMap<Integer, YahooWeatherInfo>();
 
 	public static final WeatherSliderApplication locate(Activity activity) {

diff --git a/src/main/java/com/morgan/design/android/domain/types/Temperature.java b/src/main/java/com/morgan/design/android/domain/types/Temperature.java
@@ -11,7 +11,7 @@ public enum Temperature implements Abrev {
 
 	CELSIUS("c", "Celsius");
 
-	static final Character DEGREE = new Character('\u00b0');
+	static final Character DEGREE = Character.valueOf('°');
 
 	private String abrev;
 	private String full;
@@ -23,8 +23,7 @@ private Temperature(final String abrev, final String full) {
 
 	public static Temperature to(final String temp) {
 		for (final Temperature type : values()) {
-			if (type.abrev()
-				.equalsIgnoreCase(temp)) {
+			if (type.abrev().equalsIgnoreCase(temp)) {
 				return type;
 			}
 		}

diff --git a/src/main/java/com/morgan/design/android/domain/types/WeatherConditions.java b/src/main/java/com/morgan/design/android/domain/types/WeatherConditions.java
@@ -3,13 +3,16 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import android.annotation.SuppressLint;
+
 /**
  * Based on http://developer.yahoo.com/weather/#codes
  * 
  * @author James Edward Morgan
  */
 public class WeatherConditions {
 
+	@SuppressLint("UseSparseArrays")
 	private static Map<Integer, Condition> CONDITIONS;
 	static {
 		CONDITIONS = new HashMap<Integer, Condition>();

diff --git a/src/main/java/com/morgan/design/android/factory/IconFactory.java b/src/main/java/com/morgan/design/android/factory/IconFactory.java
@@ -3,13 +3,16 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import android.annotation.SuppressLint;
+
 import com.morgan.design.android.dao.orm.WeatherChoice;
 import com.morgan.design.weatherslider.R;
 
 public class IconFactory {
 
 	public static int NOTE_FOUND = 3200;
 
+	@SuppressLint("UseSparseArrays")
 	public static final Map<Integer, Integer> WEATHER_MAP;
 
 	public static final int NA = R.drawable.weather_channel_44;