V2.0.0

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.windnow"
-    android:versionCode="7"
-    android:versionName="1.2.1" >
+    android:versionCode="8"
+    android:versionName="2.0.0" >
 
     <uses-sdk
         android:minSdkVersion="8"
@@ -12,13 +12,13 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
-        android:name=".OnlyContext"
+        android:name="com.windnow.statics.OnlyContext"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name=".MainActivity"
+            android:name="com.windnow.MainActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -41,23 +41,23 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".StationTextActivity"
+            android:name="com.windnow.StationActivity"
             android:label="@string/title_activity_station_text" >
         </activity>
         <activity
-            android:name=".StationPicActivity"
+            android:name="com.windnow.StationPicActivity"
             android:label="@string/title_activity_station_pic" >
         </activity>
         <activity
-            android:name=".SettingsActivity"
+            android:name="com.windnow.preferences.SettingsActivity"
             android:label="@string/title_activity_settings" >
         </activity>
         <activity
-            android:name=".HelpActivity"
+            android:name="com.windnow.HelpActivity"
             android:label="@string/title_activity_help" >
         </activity>
         <activity
-            android:name=".FilePreferenceActivity"
+            android:name="com.windnow.preferences.FilePreferenceActivity"
             android:label="@string/title_file_preferece_activity" >
         </activity>
 

ChangeLog

@@ -28,4 +28,12 @@ V1.2.0------------------
 
 V1.2.1------------------
 Bugfixing:
-Stations appear several times.
+Stations appear several times.
+
+V2.0.0------------------
+- User Interface: swype stations
+- User Interface: two-column-layout on wide screens
+- Cache management: old (unused) pic files get deleted
+- Windsock of a station is now colored if and only if download is younger than 1 day
+- Refresh visible station with menu button
+- Code cleanup

res/layout-w700dp/dialog_ref_del.xml

@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='utf-8'?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <Button
+        android:id="@+id/refresh"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/selector_transparent_button"
+        android:text="@string/diag_refresh_station" >
+    </Button>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:layout_marginLeft="0dip"
+        android:layout_marginRight="0dip"
+        android:background="@android:color/darker_gray" />
+
+    <Button
+        android:id="@+id/edit_st"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/selector_transparent_button"
+        android:text="@string/edit_station" >
+    </Button>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:layout_marginLeft="0dip"
+        android:layout_marginRight="0dip"
+        android:background="@android:color/darker_gray" />
+
+    <Button
+        android:id="@+id/delete"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/selector_transparent_button"
+        android:text="@string/diag_delete_station" >
+    </Button>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:layout_marginLeft="0dip"
+        android:layout_marginRight="0dip"
+        android:background="@android:color/darker_gray" />
+
+    <Button
+        android:id="@+id/fullscreen"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/selector_transparent_button"
+        android:text="@string/diag_station_full_screen" >
+    </Button>
+
+</LinearLayout>

res/layout/activity_file_preference.xml

@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".FilePreferenceActivity" >
+    tools:context="com.windnow.preferences.FilePreferenceActivity" >
 
      <ListView android:id="@android:id/list"
                android:layout_width="match_parent"

res/layout/activity_main_list.xml

@@ -0,0 +1,16 @@
+<fragment xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_list"
+    android:name="com.windnow.MainFragment"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginLeft="16dp"
+    android:layout_marginRight="16dp"
+    tools:context="com.windnow.MainActivity"
+    tools:layout="@android:layout/list_content" >
+
+
+
+</fragment>
+
+

res/layout/activity_main_twopane.xml

@@ -0,0 +1,35 @@
+<LinearLayout 
+    android:id="@+id/main_activity_two"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginLeft="16dp"
+    android:layout_marginRight="16dp"
+    android:baselineAligned="false"
+    android:orientation="horizontal"
+    android:showDividers="middle"
+    tools:context=".MainActivity" >
+
+
+    <fragment
+        android:id="@+id/main_list"
+        android:name="com.windnow.MainFragment"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        tools:layout="@android:layout/list_content" />
+
+    <View
+    android:layout_width="1dp"
+    android:layout_height="match_parent"
+    android:background="@android:color/darker_gray"/>
+
+    <FrameLayout
+        android:id="@+id/station_container"
+   		android:layout_marginLeft="16dp"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="2" />
+
+</LinearLayout>

res/layout/activity_station.xml

@@ -0,0 +1,14 @@
+<!-- <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/station_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".StationActivity"
+    tools:ignore="MergeRootFrame" /> -->
+
+<android.support.v4.view.ViewPager
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/station_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" 
+    />

res/layout/frag_station.xml

@@ -0,0 +1,25 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/stationTextLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="com.windnow.StationActivityOld" >
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:layout_marginLeft="0dip"
+        android:layout_marginRight="0dip"
+        android:background="@android:color/darker_gray" />
+
+</LinearLayout>

res/menu/station_menu.xml

@@ -0,0 +1,12 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.windnow.StationActivity" >
+
+    <item
+        android:id="@+id/action_hot_refresh"
+        android:orderInCategory="100"
+        android:title="@string/diag_refresh_station"
+        app:showAsAction="never"/>
+
+</menu>

res/values-de/strings.xml

@@ -14,7 +14,7 @@
     <string name="title_activity_station_pic">Station</string>
     <string name="title_activity_settings">Einstellungen</string>
     <string name="authors_note">        Contact: [email protected] \n
-        Copyright 2014 \n
+        Copyright 2015 \n
         by Florian Hauser</string>
     <string name="legal_notice">    Dependencies:\n
     jsoup - http://jsoup.org/ \n
@@ -53,6 +53,7 @@ Es gibt drei Möglichkeiten um neue Stationen anzulegen:\n
     <string name="really_delete">Diese Station wirklich löschen?</string>
     <string name="diag_refresh_station">Station neu laden</string>
     <string name="diag_delete_station">Station löschen</string>
+	<string name="diag_station_full_screen">Station maximieren</string>
     <string name="not_loaded">Nicht geladen</string>
     <string name="downloaded_at">"Geladen: "</string>
     <string name="title_activity_help">Hilfe</string>

res/values-w700dp/refs.xml

@@ -0,0 +1,12 @@
+<resources>
+
+    <!--
+    Layout alias to replace the single-pane version of the layout with a
+    two-pane version on Large screens.
+
+    For more on layout aliases, see:
+    http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters
+    -->
+    <item name="activity_main_list" type="layout">@layout/activity_main_twopane</item>
+
+</resources>

res/values/strings.xml

@@ -14,7 +14,7 @@
     <string name="title_activity_station_pic">Station</string>
     <string name="title_activity_settings">Settings</string>
     <string name="authors_note">        Contact: [email protected] \n
-        Copyright 2014 \n
+        Copyright 2015 \n
         by Florian Hauser</string>
     <string name="legal_notice">    Dependencies:\n
     jsoup - http://jsoup.org/ \n
@@ -52,6 +52,7 @@ There are three ways to create new stations:\n
     <string name="really_delete">Really delete this station?</string>
     <string name="diag_refresh_station">Refresh Station</string>
     <string name="diag_delete_station">Delete Station</string>
+	<string name="diag_station_full_screen">Open station full-screen</string>
     <string name="not_loaded">Not loaded</string>
     <string name="downloaded_at">"Downloaded: "</string>
     <string name="title_activity_help">Help</string>

res/xml/pref_general.xml

@@ -6,7 +6,7 @@
         android:title="@string/menu_sel_stationsfile" >
         <intent
             android:action="android.intent.action.VIEW"
-            android:targetClass="com.windnow.FilePreferenceActivity"
+            android:targetClass="com.windnow.preferences.FilePreferenceActivity"
             android:targetPackage="com.windnow" />
     </Preference>