reached a stable candidate for v0.9.0?

.gitignore

@@ -2,3 +2,4 @@ bin/
 gen/
 .idea/
 out/
+*.iml

AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	android:versionCode="13" package="cc.task3.pomodroid"
+	android:versionCode="12" package="it.unibz.pomodroid"
 	android:versionName="0.9.0">
 	<application android:icon="@drawable/pomo_logo"
 		android:label="@string/app_name">
@@ -41,7 +41,7 @@
 		<activity android:name=".About" android:label="@string/about">
 		</activity>
 	</application>
-	<uses-sdk android:minSdkVersion="7" />
+	<uses-sdk android:minSdkVersion="4" />
 	<uses-permission android:name="android.permission.INTERNET"></uses-permission>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
 	<uses-permission android:name="android.permission.WAKE_LOCK" />

proguard.cfg

@@ -0,0 +1,36 @@
+-optimizationpasses 5
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-dontpreverify
+-verbose
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class com.android.vending.licensing.ILicensingService
+
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+-keepclasseswithmembernames class * {
+    public <init>(android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembernames class * {
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}

res/layout/about.xml

@@ -6,13 +6,21 @@
 		android:orientation="vertical" android:layout_width="fill_parent"
 		android:layout_height="fill_parent">
 
-		<ImageView android:id="@+id/imagebutton" android:src="@drawable/pomodoro"
+		<ImageView android:id="@+id/imagebutton" android:src="@drawable/pomo_logo"
 			android:layout_width="wrap_content" android:layout_height="wrap_content"
 			android:gravity="center" android:layout_gravity="center" android:layout_marginBottom="30px"  />
 
-		<TextView android:id="@+id/atvAbout2" android:text="@string/about_2" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
-		<TextView android:id="@+id/atvAbout3" android:text="@string/about_3" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
-		<TextView android:id="@+id/atvAbout4" android:text="@string/about_4" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>	
+		<TextView android:id="@+id/atvAboutText" android:text="@string/about_text" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+        <TextView android:id="@+id/atvAboutProjectText" android:text="@string/about_project_text" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+        <TextView android:id="@+id/atvAboutProjectURL" android:text="@string/about_project_url" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+        <TextView android:id="@+id/atvAboutGithubText" android:text="@string/about_github_text" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+        <TextView android:id="@+id/atvAboutGithubURL" android:text="@string/about_github_url" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+        <TextView android:id="@+id/atvAboutBugText" android:text="@string/about_bug_text" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+        <TextView android:id="@+id/atvAboutBugURL" android:text="@string/about_bug_url" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+        <TextView android:id="@+id/atvAboutEmailText" android:text="@string/about_email_text" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+        <TextView android:id="@+id/atvAboutEmailURL" android:text="@string/about_email_url" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
 
-	</LinearLayout>
+
+
+    </LinearLayout>
 </ScrollView>

res/layout/activitysheet.xml

@@ -2,6 +2,21 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical" android:layout_width="fill_parent"
 	android:layout_height="fill_parent">
+    <RelativeLayout android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" android:layout_alignParentTop="true"
+                    android:visibility="gone" android:id="@+id/arlQuickInsertActivity" android:paddingTop="5px">
+
+        <Button android:text="+" android:id="@+id/abQuickInsertActivity"
+                android:layout_alignParentRight="true" android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+
+        <EditText android:id="@+id/aetQuickInsertActivity"
+                  android:layout_width="fill_parent" android:layout_toLeftOf="@id/abQuickInsertActivity"
+                  android:layout_height="wrap_content" android:singleLine="true"
+                  android:hint="Quick Activity Insert" />
+
+    </RelativeLayout>
 	<RelativeLayout android:id="@+id/arlActivityList"
 		android:layout_width="wrap_content" android:layout_height="wrap_content">
 		<ListView android:id="@android:id/list" android:layout_width="fill_parent"
@@ -17,19 +32,13 @@
 		</LinearLayout>
 
 	</RelativeLayout>
-	<RelativeLayout android:layout_width="wrap_content"
-		android:layout_height="wrap_content" android:layout_alignParentBottom="true"
-		android:visibility="gone" android:id="@+id/arlQuickInsertActivity">
+    <RelativeLayout android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" android:layout_alignParentBottom="true"
+                    android:visibility="gone" android:id="@+id/arlGoToPomodoro" android:paddingTop="5px">
 
-		<Button android:text="+" android:id="@+id/abQuickInsertActivity"
-			android:layout_alignParentRight="true" android:layout_width="wrap_content"
-			android:layout_height="wrap_content" />
+        <Button android:text="Go to Running Pomodoro" android:id="@+id/abGoToPomodoro"
+                android:layout_alignParentRight="true" android:layout_width="fill_parent"
+                android:layout_height="wrap_content" />
+    </RelativeLayout>
 
-
-		<EditText android:id="@+id/aetQuickInsertActivity"
-			android:layout_width="fill_parent" android:layout_toLeftOf="@id/abQuickInsertActivity"
-			android:layout_height="wrap_content" android:singleLine="true"
-			android:hint="Quick Activity Insert" />
-
-	</RelativeLayout>
 </RelativeLayout>

res/layout/cleandatabase.xml

@@ -5,7 +5,7 @@
 <TextView android:layout_width="fill_parent"
 		android:id="@+id/hello"
 		android:layout_height="wrap_content" android:text="@string/cleanDB"/>
-<Button android:text="Defragment the Database" android:id="@+id/abDefragmentDatabase"></Button>
-<Button android:text="Delete Activities and Events" android:id="@+id/abDeleteActivitiesEvents"  ></Button>
-<Button android:text="Destroy the Database" android:id="@+id/abDeleteDatabase"></Button>
+<Button android:text="Defragment the Database" android:id="@+id/abDefragmentDatabase"  android:layout_height="wrap_content" android:layout_width="fill_parent"></Button>
+<Button android:text="Delete Activities and Events" android:id="@+id/abDeleteActivitiesEvents"  android:layout_height="wrap_content" android:layout_width="fill_parent"></Button>
+<Button android:text="Destroy the Database" android:id="@+id/abDeleteDatabase "  android:layout_height="wrap_content" android:layout_width="fill_parent"></Button>
 </LinearLayout>

res/values/strings.xml

@@ -42,7 +42,7 @@
 	<string name="priority">Priority</string>
 	<string name="description">Description</string>
 	<string name="preferences">Preferences</string>
-	<string name="preferences_intro">Pomodroid Settings</string>
+	<string name="preferences_intro">Use the Menu button to save the preferences.</string>
 	<string name="preferences_firsttime">Welcome to Pomodroid.\n
 		This is the first time that
 		you run the program. Please do the following: \n \n
@@ -74,14 +74,16 @@
 		button.\nYou can also access the list of services by pressing the
 		Menu button.\nPlease don\'t leave this window until all the operations finished.\n\n</string>
 	<string name="about">About</string>
-	<string name="about_1">Pomodroid is the opensource Android tool that lets
+	<string name="about_text">Pomodroid is the opensource Android tool that lets
 		you either define activities or download tickets from Trac environments and 
 		face them according to the Pomodoro Technique.\n\n
-		NEW: Simple Mode and Advanced Mode!
-		Pomodroid will automatically collect metrics while you are working.\n\n
-		THIS IS ALPHA SOFTWARE: please visit the official site for more info and links to documentation:\n
-		</string>
-	<string name="about_2">http://task3.cc/projects/pomodroid</string>
-	<string name="about_3">\n\nIMPROVE POMODROID! You can help Pomodroid in many ways. See the Project Wiki for info:</string>
-	<string name="about_4">http://github.com/dgraziotin/Pomodroid</string>
+	</string>
+    <string name="about_project_text">Pomodroid official website:</string>
+    <string name="about_project_url">http://task3.cc/projects/pomodroid</string>
+    <string name="about_github_text">Pomodroid Source code:</string>
+    <string name="about_github_url">http://github.com/dgraziotin/Pomodroid</string>
+    <string name="about_bug_text">Report a Bug / Feature Request (Requires GitHub Account)</string>
+    <string name="about_bug_url">http://github.com/dgraziotin/Pomodroid</string>
+    <string name="about_email_text">General Feedback / Report a Bug / Feature Request (e-mail)</string>
+    <string name="about_email_url">[email protected]</string>
 </resources>

src/it/unibz/pomodroid/About.java

@@ -14,28 +14,34 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Pomodroid.  If not, see <http://www.gnu.org/licenses/>.
  */
-package cc.task3.pomodroid;
+package it.unibz.pomodroid;
+
 import android.os.Bundle;
+import android.text.Html;
 import android.text.util.Linkify;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
 import android.widget.TextView;
 
 /**
  * A simple Activity to show an About Window
+ *
  * @author Daniel Graziotin <d AT danielgraziotin DOT it>
- * @see cc.task3.pomodroid.SharedActivity
+ * @see it.unibz.pomodroid.SharedActivity
  */
 public class About extends SharedActivity {
 
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.about);
-		TextView atvAbout2 = (TextView) findViewById(R.id.atvAbout2);
-		TextView atvAbout4 = (TextView) findViewById(R.id.atvAbout4);
-		Linkify.addLinks(atvAbout2,Linkify.ALL);
-		Linkify.addLinks(atvAbout4,Linkify.ALL);
-	}
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.about);
+        TextView atvAboutProjectURL = (TextView) findViewById(R.id.atvAboutProjectURL);
+        TextView atvAboutGithubURL = (TextView) findViewById(R.id.atvAboutGithubURL);
+        TextView atvAboutBugURL = (TextView) findViewById(R.id.atvAboutBugURL);
+        TextView atvAboutEmailURL = (TextView) findViewById(R.id.atvAboutEmailURL);
+        atvAboutEmailURL.setText(Html.fromHtml(getString(R.string.about_email_url)));
+
+        Linkify.addLinks(atvAboutProjectURL, Linkify.ALL);
+        Linkify.addLinks(atvAboutGithubURL, Linkify.ALL);
+        Linkify.addLinks(atvAboutBugURL, Linkify.ALL);
+        Linkify.addLinks(atvAboutEmailURL, Linkify.EMAIL_ADDRESSES);
+    }
 }