Prepared 1.1.1 release

Updated CHANGELOG Removed buttons from the loading layouts (we couldn't set PendingIntents on them anyway, so they were useless) Changed the widget minimum dimensions to closely fit on the grid with a minimum dimension of 4x2 and a standard dimension of 4x3
frakbot · Jul 11, 2013 · cd7818f · cd7818f
1 parent 49f289a
commit cd7818f
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 43 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="net.frakbot.FWeather"
-          android:versionCode="3"
-          android:versionName="1.1-beta2">
+          android:versionCode="4"
+          android:versionName="1.1.3">
 
     <uses-sdk
             android:minSdkVersion="10"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,9 @@ Changelog
 ### Version 1.1.3 ###
 Released on 11th July 2013
 
-- FIX: removed <5 minutes refresh timings (were only meant for debugging)
+- NEW: weather is now cached to reduce "???" messages while searching for a location
+- FIX: removed 1 minute refresh interval (was only meant for debugging)
+- FIX: removed buttons from loading layouts, they couldn't do anything anyway
 
 ### Version 1.1-beta2 ###
 Released on 10th July 2013

diff --git a/res/layout/loading_large.xml b/res/layout/loading_large.xml
@@ -30,8 +30,6 @@
             android:gravity="center_vertical|left"
             tools:ignore="UselessParent">
 
-        <include layout="@layout/include_widgetbuttons"/>
-
         <ProgressBar
                 android:id="@+id/img_weathericon"
                 android:layout_width="wrap_content"
@@ -57,7 +55,6 @@
                 android:bufferType="spannable"
                 style="@style/SmallText.Medium"/>
 
-
     </RelativeLayout>
 
 </FrameLayout>
diff --git a/res/layout/loading_small.xml b/res/layout/loading_small.xml
@@ -30,8 +30,6 @@
             android:gravity="center_vertical|left"
             tools:ignore="UselessParent">
 
-        <include layout="@layout/include_widgetbuttons" />
-
         <ProgressBar
                 android:id="@+id/img_weathericon"
                 android:layout_width="wrap_content"
@@ -40,23 +38,22 @@
                 style="?android:progressBarStyle"/>
 
         <TextView
-            android:id="@+id/txt_weather"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/img_weathericon"
-            android:text="@string/loading_main"
-            android:bufferType="spannable"
-            style="@style/MainText.Small"/>
+                android:id="@+id/txt_weather"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/img_weathericon"
+                android:text="@string/loading_main"
+                android:bufferType="spannable"
+                style="@style/MainText.Small"/>
 
         <TextView
-            android:id="@+id/txt_temp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/txt_weather"
-            android:text="@string/loading_small"
-            android:bufferType="spannable"
-            style="@style/SmallText.Small"/>
-
+                android:id="@+id/txt_temp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/txt_weather"
+                android:text="@string/loading_small"
+                android:bufferType="spannable"
+                style="@style/SmallText.Small"/>
 
     </RelativeLayout>
 

diff --git a/res/xml/fweather_info.xml b/res/xml/fweather_info.xml
@@ -16,10 +16,10 @@
   -->
 
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:minWidth="300dp"
-                    android:minHeight="200dp"
-                    android:minResizeWidth="200dp"
-                    android:minResizeHeight="100dp"
+                    android:minWidth="294dp"
+                    android:minHeight="220dp"
+                    android:minResizeWidth="250dp"
+                    android:minResizeHeight="120dp"
                     android:updatePeriodMillis="0"
                     android:previewImage="@drawable/fweather_preview"
                     android:initialLayout="@layout/loading_small"

diff --git a/src/net/frakbot/FWeather/updater/UpdaterService.java b/src/net/frakbot/FWeather/updater/UpdaterService.java
@@ -20,39 +20,25 @@
 import android.app.IntentService;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.AssetManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.location.Address;
-import android.location.Geocoder;
-import android.location.Location;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.View;
 import android.widget.RemoteViews;
 import android.widget.Toast;
 import net.frakbot.FWeather.R;
 import net.frakbot.FWeather.activity.SettingsActivity;
 import net.frakbot.FWeather.global.Const;
-import net.frakbot.FWeather.updater.weather.JSONWeatherParser;
-import net.frakbot.FWeather.updater.weather.WeatherHttpClient;
 import net.frakbot.FWeather.updater.weather.model.Weather;
 import net.frakbot.FWeather.util.*;
-import org.json.JSONException;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.List;
 import java.util.Locale;
 
 /**
@@ -69,7 +55,6 @@ public class UpdaterService extends IntentService {
     public static final String EXTRA_SILENT_FORCE_UPDATE = "a_ninja_is_making_me_do_it";
     public static final String EXTRA_WIDGET_IDS = "widget_ids";
 
-
     private Handler mHandler;
 
     public UpdaterService() {
@@ -105,7 +90,6 @@ protected void onHandleIntent(Intent intent) {
 
         if (intent.getBooleanExtra(EXTRA_USER_FORCE_UPDATE, false)) {
             FLog.i(this, TAG, "User has requested a forced update");
-            // TODO: custom Toast layout? Would be nice.
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {