Merge branch 'master' of github.com:dreeves/TagTime

tagtime · Jun 9, 2014 · dea22fb · dea22fb
2 parents a6eb567 + 709a142
commit dea22fb
Show file tree

Hide file tree

Showing 22 changed files with 681 additions and 177 deletions.
diff --git a/src/and/AndroidManifest.xml b/src/and/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="bsoule.tagtime"
-    android:versionCode="10"
-    android:versionName="1.3.2" >
+    android:versionCode="12"
+    android:versionName="1.3.4" >
 
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -45,8 +45,8 @@
             android:name=".ViewGoals"
             android:label="@string/viewgoals_title" />
         <activity
-            android:name=".Export"
-            android:label="@string/export_title" />
+            android:name=".ManageData"
+            android:label="@string/managedata_title" />
         <activity
             android:name=".Preferences"
             android:label="@string/prefs_title" />

diff --git a/src/and/res/layout/about_dialog.xml b/src/and/res/layout/about_dialog.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2012 Uluc Saranli
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:paddingLeft="5dip"
+    android:paddingRight="5dip" >
+
+    <ImageView
+        android:id="@+id/about_logo"
+        android:layout_width="110dip"
+        android:layout_height="110dip"
+        android:layout_centerHorizontal="true"
+        android:layout_margin="5dip"
+        android:contentDescription=""
+        android:src="@drawable/tagtime_01" />
+
+    <TextView
+        android:id="@+id/about_version"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/about_logo"
+        android:layout_marginBottom="5dip"
+        android:gravity="center"
+        android:text="@string/about_version" />
+
+    <ScrollView
+        android:id="@+id/about_scroll"
+        android:layout_width="fill_parent"
+        android:layout_height="210dip"
+        android:layout_below="@+id/about_version" >
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" 
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/about_text"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:autoLink="web"
+                android:gravity="center"
+                android:text="@string/about_text" />
+
+            <Button
+                android:id="@+id/about_rate"
+                android:layout_width="200dip"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="10dip"
+                android:text="@string/about_googleplay"
+                android:textSize="15sp" />
+        </LinearLayout>
+    </ScrollView>
+
+</RelativeLayout>
diff --git a/src/and/res/layout/tagtime_editgoal.xml b/src/and/res/layout/tagtime_editgoal.xml
@@ -34,21 +34,46 @@
             android:layout_weight="1" />
     </LinearLayout>
 
-    <Button
-        android:id="@+id/select"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:layout_margin="10dip"
-        android:text="@string/editgoal_select"
-        android:textSize="16sp" />
+        android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/select"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/editgoal_select"
+            android:textSize="16sp" />
+
+        <Button
+            android:id="@+id/visit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dip"
+            android:text="@string/editgoal_visit"
+            android:textSize="16sp" />
+
+        <TextView
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+    </LinearLayout>
 
     <TextView
-        android:layout_marginTop="10dip"
         android:layout_width="fill_parent"
         android:layout_height="2dip"
         android:layout_marginLeft="10dip"
         android:layout_marginRight="10dip"
+        android:layout_marginTop="10dip"
         android:background="#eeeeee"
         android:gravity="center" />
 

diff --git a/src/and/res/layout/tagtime_export.xml → src/and/res/layout/tagtime_managedata.xml b/src/and/res/layout/tagtime_export.xml → src/and/res/layout/tagtime_managedata.xml
diff --git a/src/and/res/values/strings.xml b/src/and/res/values/strings.xml
@@ -29,16 +29,26 @@
     <string name="editgoal_confirm">Save</string>
     <string name="editgoal_delete">Unlink</string>
     <string name="editgoal_select">Select Goal</string>
+    <string name="editgoal_visit">Visit Goal</string>
     <string name="editgoal_tags">Select Tags</string>
     <string name="editgoal_notags">You must select at least one tag!</string>
     <string name="editgoal_nogoal">You must select a valid goal!</string>
 
     <string name="app_title">TagTime</string>
-    <string name="export_title">TagTime Manage Data</string>
+    <string name="managedata_title">TagTime Manage Data</string>
     <string name="viewlog_title">TagTime Ping Log</string>
     <string name="editping_title">Edit TagTime Ping</string>
     <string name="viewgoals_title">TagTime Beeminder Links</string>
     <string name="editgoal_title">Edit Beeminder Link</string>
     <string name="prefs_title">TagTime Preferences</string>
+    <string name="about_title">TagTime for Android</string>
+
+	<!-- ABOUT DIALOG ########################################################## -->
+	<string name="about_title">TagTime for Android</string>
+	<string name="about_version">Version vvv build bbb</string>
+	<string name="about_text">TagTime is a stochastic sampler to measure what you spend your time on.\nhttp://messymatters.com/tagtime</string>
+	<string name="about_dismiss">Dismiss</string>
+	<string name="about_changelog">ChangeLog</string>
+	<string name="about_googleplay">Visit on Google Play</string>
 
 </resources>
diff --git a/src/and/res/values/styles.xml b/src/and/res/values/styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2012 Uluc Saranli
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+-->
+<resources>
+
+    <!-- ========= ABOUT DIALOG ========== -->
+    <style name="about_dialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowTitleStyle">@style/about_dialog_title</item>
+    </style>
+
+    <style name="about_dialog_title" parent="@android:style/TextAppearance.DialogWindowTitle">
+        <item name="android:gravity">center_horizontal</item>
+    </style>
+
+</resources>
diff --git a/src/and/res/xml/preferences.xml b/src/and/res/xml/preferences.xml
@@ -48,4 +48,17 @@
 	   /> 
 
   </PreferenceCategory>
+    <PreferenceCategory android:title="TagTime App" >
+<!--         <Preference -->
+<!--             android:key="backupPref" -->
+<!--             android:title="Backup Data to SD" /> -->
+
+<!--         <Preference -->
+<!--             android:key="restorePref" -->
+<!--             android:title="Restore Data from SD" /> -->
+
+        <Preference
+            android:key="aboutPref"
+            android:title="About TagTime" />
+    </PreferenceCategory>
 </PreferenceScreen>
diff --git a/src/and/src/ChangeLog b/src/and/src/ChangeLog
@@ -0,0 +1,20 @@
+1.3.4
+
+ - New: Time of day for Beeminder data points
+ - Fix: Ping list refresh following ping update
+
+1.3.3
+
+ - New: Added an about dialog
+ - New: Visit goal button (requires an update to the Beeminder app)
+ - Fix: Crashes on ping and Beeminder database race conditions
+ - Fix: Crash on closing Beeminder session with errors
+
+1.3.2
+
+ - New: Beeminder submissions respect ping gap
+ - New: Navigation and home buttons for ping editing 
+ - New: Beeminder integration
+ - New: option to silence pings while charging
+ - Fix: Notification sound for silent setting
+