backup mostly(not sure about image size, but have a guess) works

sFreezer · Jan 22, 2012 · 985635d · 985635d
1 parent 4b867d9
commit 985635d
Show file tree

Hide file tree

Showing 26 changed files with 218 additions and 213 deletions.
diff --git a/MeditationTracker/AndroidManifest.xml b/MeditationTracker/AndroidManifest.xml
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    android:installLocation="auto"
     package="com.meditationtracker"
     android:versionCode="6"
-    android:versionName="Torma" android:installLocation="auto">
+    android:versionName="Torma" >
+
+    <uses-sdk android:minSdkVersion="4" />
+
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <!-- uses-permission android:name="android.permission.INTERNET" / -->
 
     <application
         android:allowBackup="true"
         android:backupAgent="com.meditationtracker.sync.backup.BackupAgent"
-        android:debuggable="true"
+        android:debuggable="false"
         android:hardwareAccelerated="true"
         android:icon="@drawable/launcher_48"
         android:label="@string/app_name"
         android:restoreAnyVersion="true"
-        android:theme="@android:style/Theme.Light.NoTitleBar">
+        android:theme="@android:style/Theme.Light.NoTitleBar" >
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name" >
@@ -44,11 +50,10 @@
 
         <activity android:name="SessionActivity" >
         </activity>
-    </application>
 
-    <uses-sdk android:minSdkVersion="4" />
-
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <!-- uses-permission android:name="android.permission.INTERNET" / -->
+        <meta-data
+            android:name="com.google.android.backup.api_key"
+            android:value="AEdPqrEAAAAIPxIT_3FPso7HrtSQo4huTN2PCr5nWrp9uScIAA" />
+    </application>
 
 </manifest>
diff --git a/MeditationTracker/gen/com/meditationtracker/R.java b/MeditationTracker/gen/com/meditationtracker/R.java
@@ -62,7 +62,7 @@ public static final class id {
         public static final int LinearLayout01=0x7f090005;
         public static final int LinearLayout02=0x7f090012;
         public static final int LinearLayout03=0x7f09000f;
-        public static final int RelativeLayout01=0x7f09002b;
+        public static final int RelativeLayout01=0x7f09002c;
         public static final int ScrollView01=0x7f090004;
         public static final int TableLayout01=0x7f090020;
         public static final int TableLayout02=0x7f090024;
@@ -80,7 +80,6 @@ public static final class id {
         public static final int editPracticeButton=0x7f09001e;
         public static final int headerLayout=0x7f090000;
         public static final int imageSourceGroup=0x7f09003b;
-        public static final int imgMore=0x7f09002d;
         public static final int imgPractice=0x7f09001f;
         public static final int linearLayout1=0x7f090002;
         public static final int menuBar=0x7f09000b;
@@ -89,7 +88,7 @@ public static final class id {
         public static final int openPractice=0x7f09003e;
         public static final int pickerScheduledEndDate=0x7f090033;
         public static final int practiceImage=0x7f09000c;
-        public static final int practiceImg=0x7f09002c;
+        public static final int practiceImg=0x7f09002d;
         public static final int practiceProgressBar=0x7f090023;
         public static final int practiceTitle=0x7f09002e;
         public static final int prefTimePicker=0x7f090038;
@@ -110,7 +109,7 @@ public static final class id {
         public static final int textMalaSize=0x7f090016;
         public static final int textPracticeName=0x7f09000e;
         public static final int textRepetitionCount=0x7f090011;
-        public static final int textScheduledEndDate=0x7f09002a;
+        public static final int textScheduledEndDate=0x7f09002b;
         public static final int textScheduledForToday=0x7f090025;
         public static final int textTimer=0x7f090034;
         public static final int textVersion=0x7f090003;
@@ -124,6 +123,7 @@ public static final class id {
         public static final int titlePracticeName=0x7f09000d;
         public static final int titleRepetitionCount=0x7f090010;
         public static final int titleReqRepetitions=0x7f090021;
+        public static final int titleScheduledCompletionDate=0x7f09002a;
         public static final int titleScheduledForToday=0x7f090026;
     }
     public static final class layout {

diff --git a/MeditationTracker/gen/doo/util/root/R.java b/MeditationTracker/gen/doo/util/root/R.java
@@ -62,7 +62,7 @@ public static final class id {
         public static final int LinearLayout01=0x7f090005;
         public static final int LinearLayout02=0x7f090012;
         public static final int LinearLayout03=0x7f09000f;
-        public static final int RelativeLayout01=0x7f09002b;
+        public static final int RelativeLayout01=0x7f09002c;
         public static final int ScrollView01=0x7f090004;
         public static final int TableLayout01=0x7f090020;
         public static final int TableLayout02=0x7f090024;
@@ -80,7 +80,6 @@ public static final class id {
         public static final int editPracticeButton=0x7f09001e;
         public static final int headerLayout=0x7f090000;
         public static final int imageSourceGroup=0x7f09003b;
-        public static final int imgMore=0x7f09002d;
         public static final int imgPractice=0x7f09001f;
         public static final int linearLayout1=0x7f090002;
         public static final int menuBar=0x7f09000b;
@@ -89,7 +88,7 @@ public static final class id {
         public static final int openPractice=0x7f09003e;
         public static final int pickerScheduledEndDate=0x7f090033;
         public static final int practiceImage=0x7f09000c;
-        public static final int practiceImg=0x7f09002c;
+        public static final int practiceImg=0x7f09002d;
         public static final int practiceProgressBar=0x7f090023;
         public static final int practiceTitle=0x7f09002e;
         public static final int prefTimePicker=0x7f090038;
@@ -110,7 +109,7 @@ public static final class id {
         public static final int textMalaSize=0x7f090016;
         public static final int textPracticeName=0x7f09000e;
         public static final int textRepetitionCount=0x7f090011;
-        public static final int textScheduledEndDate=0x7f09002a;
+        public static final int textScheduledEndDate=0x7f09002b;
         public static final int textScheduledForToday=0x7f090025;
         public static final int textTimer=0x7f090034;
         public static final int textVersion=0x7f090003;
@@ -124,6 +123,7 @@ public static final class id {
         public static final int titlePracticeName=0x7f09000d;
         public static final int titleRepetitionCount=0x7f090010;
         public static final int titleReqRepetitions=0x7f090021;
+        public static final int titleScheduledCompletionDate=0x7f09002a;
         public static final int titleScheduledForToday=0x7f090026;
     }
     public static final class layout {

diff --git a/MeditationTracker/res/layout-land/session.xml b/MeditationTracker/res/layout-land/session.xml
@@ -13,15 +13,15 @@
 		android:layout_height="fill_parent" android:orientation="horizontal">
 
 		<ScrollView android:id="@+id/ScrollView01"
-			android:background="#ffffff" android:keepScreenOn="true"
-			android:layout_height="wrap_content" android:layout_width="wrap_content">
-			<LinearLayout android:layout_height="fill_parent"
+			android:keepScreenOn="true"
+			android:layout_height="wrap_content" android:layout_width="wrap_content" android:paddingRight="10dp">
+			<LinearLayout android:layout_height="wrap_content"
 				android:background="#ffffff" android:orientation="vertical"
-				android:layout_width="fill_parent" android:padding="10px">
+				android:layout_width="fill_parent">
 
 				<ImageView android:layout_height="wrap_content"
-					android:src="@drawable/karmapa" android:padding="10dip" android:id="@+id/imgPractice"
-					android:layout_width="wrap_content" android:layout_gravity="center"></ImageView>
+					android:src="@drawable/karmapa" android:id="@+id/imgPractice"
+					android:layout_width="wrap_content" android:layout_gravity="center" android:paddingLeft="10dp"></ImageView>
 				<TextView android:layout_width="wrap_content"
 					android:layout_height="wrap_content" android:layout_gravity="center"
 					android:text="10:00:00" android:textSize="35sp" android:id="@+id/textTimer"

diff --git a/MeditationTracker/res/layout/main.xml b/MeditationTracker/res/layout/main.xml
@@ -20,7 +20,7 @@
 
 		<LinearLayout android:id="@+id/LinearLayout01"
 			android:orientation="vertical" android:layout_width="fill_parent"
-			android:layout_height="fill_parent" android:addStatesFromChildren="true">
+			android:layout_height="wrap_content" android:addStatesFromChildren="true">
 
 			<TextView android:layout_height="wrap_content"
 				android:textStyle="bold" android:textColor="#000000" android:text="@string/ngondroTitle"
@@ -37,7 +37,7 @@
 			<TextView android:layout_height="wrap_content" android:text="@string/myMeditationsTitle"
 				android:textColor="#000000" android:textStyle="bold"
 				android:textSize="23sp" android:id="@+id/customPracticesTitle"
-				android:layout_below="@id/ngondroList" android:paddingLeft="10dip"
+				android:paddingLeft="10dip"
 				android:layout_width="fill_parent" android:background="#ffffff"
 				android:layout_marginTop="20dip"></TextView>
 			<com.meditationtracker.controls.NoScrollListView

diff --git a/MeditationTracker/res/layout/new_meditation.xml b/MeditationTracker/res/layout/new_meditation.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:doo="http://schemas.durilka.com/doo"
-	android:layout_height="fill_parent" android:background="#ffffff"
+	android:layout_height="fill_parent" 
 	android:layout_width="fill_parent">
-	<LinearLayout android:background="#ffffff"
+	<LinearLayout 
 		android:layout_width="fill_parent" android:orientation="vertical"
-		android:layout_height="fill_parent">
+		android:layout_height="wrap_content">
 
 		<com.meditationtracker.controls.MenuBar
 			android:layout_height="wrap_content" android:layout_width="fill_parent"
@@ -18,30 +18,27 @@
 			android:scaleType="fitCenter"></ImageView>
 
 		<TextView android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:layout_below="@id/practiceImage"
+			android:layout_height="wrap_content" 
 			android:id="@+id/titlePracticeName" android:text="@string/practiceName"
 			android:layout_marginLeft="10dip" android:textColor="#000000"></TextView>
 		<EditText android:text="" android:id="@+id/textPracticeName"
 			android:layout_height="wrap_content" android:layout_width="fill_parent"
-			android:layout_below="@id/titlePracticeName"
-			android:layout_marginLeft="10dip" android:layout_marginRight="10dip"></EditText>
+			android:layout_marginLeft="10dip" android:layout_marginRight="10dip" android:inputType="text|textCapSentences|textAutoCorrect"></EditText>
 
 		<LinearLayout android:id="@+id/LinearLayout03"
-			android:layout_height="wrap_content" android:layout_width="fill_parent">
+			android:layout_height="wrap_content" android:layout_width="fill_parent" android:baselineAligned="false">
 			<LinearLayout android:id="@+id/LinearLayout01"
 				android:layout_width="wrap_content" android:layout_height="wrap_content"
 				android:orientation="vertical" android:layout_weight="1">
 				<TextView android:layout_width="wrap_content"
-					android:layout_height="wrap_content" android:layout_below="@id/textPracticeName"
+					android:layout_height="wrap_content" 
 					android:id="@+id/titleRepetitionCount" android:text="@string/requiredRepetitions"
-					android:layout_marginLeft="10dip" android:layout_weight="1"
+					android:layout_marginLeft="10dip" 
 					android:textColor="#000000"></TextView>
 
 
 				<EditText android:text="" android:id="@+id/textRepetitionCount"
-					android:layout_height="wrap_content" android:layout_below="@id/titleRepetitionCount"
-					android:layout_alignRight="@id/titleRepetitionCount"
-					android:layout_alignLeft="@id/titleRepetitionCount"
+					android:layout_height="wrap_content" 
 					android:layout_width="fill_parent" android:layout_marginLeft="10dip"
 					android:inputType="number"></EditText>
 			</LinearLayout>
@@ -50,25 +47,21 @@
 				android:layout_width="wrap_content" android:layout_height="wrap_content"
 				android:orientation="vertical" android:layout_weight="1">
 				<TextView android:layout_width="wrap_content"
-					android:layout_height="wrap_content" android:layout_below="@id/textPracticeName"
+					android:layout_height="wrap_content" 
 					android:id="@+id/titleCompletedCount" android:text="@string/completedRepetitions"
-					android:layout_toLeftOf="@id/titleRepetitionCount"
-					android:layout_alignParentRight="true" android:layout_marginRight="10dip"
-					android:layout_weight="1" android:textColor="#000000"></TextView>
+					android:layout_marginRight="10dip"
+					android:textColor="#000000"></TextView>
 
 				<EditText android:text="" android:id="@+id/textCompletedRepetitions"
-					android:layout_height="wrap_content" android:layout_below="@id/titleCompletedCount"
-					android:layout_alignParentRight="true" android:layout_toRightOf="@id/textRepetitionCount"
-					android:layout_alignLeft="@id/titleCompletedCount"
-					android:layout_alignRight="@id/titleCompletedCount"
+					android:layout_height="wrap_content" 
 					android:layout_width="fill_parent" android:layout_marginRight="10dip"
-					android:layout_weight="0.5" android:inputType="number"></EditText>
+					android:inputType="number"></EditText>
 			</LinearLayout>
 
 		</LinearLayout>
 
 		<TextView android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:layout_marginLeft="10dip" android:layout_weight="1"
+			android:layout_height="0dip" android:layout_marginLeft="10dip" android:layout_weight="1"
 			android:textColor="#000000" android:id="@+id/titleMalaSize" android:text="@string/customMalaSize"></TextView>
 
 

diff --git a/MeditationTracker/res/layout/post_install.xml b/MeditationTracker/res/layout/post_install.xml
@@ -1,19 +1,38 @@
 <?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">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/scrollView1"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content" >
 
-	<ScrollView android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:id="@+id/scrollView1">
-		<LinearLayout android:layout_width="fill_parent"
-			android:id="@+id/linearLayout1" android:layout_height="fill_parent" android:orientation="vertical">
-			<TextView android:text="@string/postInstallWelcome"
-				android:id="@+id/textView1" android:layout_width="wrap_content"
-				android:layout_height="wrap_content" android:layout_margin="10dp" android:textColor="#f0f0f0"></TextView>
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
 
-			<TextView android:text="@string/appUrl" android:id="@+id/textView2"
-				android:layout_width="wrap_content" android:layout_height="wrap_content" android:clickable="true" android:gravity="center" android:lines="1" android:ellipsize="marquee" android:maxLines="1" android:layout_margin="10dp" android:textColor="#f0f0f0" android:autoLink="web"></TextView>
+        <TextView
+            android:id="@+id/textView1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:text="@string/postInstallWelcome"
+            android:textColor="#f0f0f0" >
+        </TextView>
 
-		</LinearLayout>
-	</ScrollView>
-</LinearLayout>
+        <TextView
+            android:id="@+id/textView2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:autoLink="web"
+            android:clickable="true"
+            android:ellipsize="marquee"
+            android:gravity="center"
+            android:lines="1"
+            android:maxLines="1"
+            android:text="@string/appUrl"
+            android:textColor="#f0f0f0" >
+        </TextView>
+    </LinearLayout>
+
+</ScrollView>
diff --git a/MeditationTracker/res/layout/practice.xml b/MeditationTracker/res/layout/practice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:background="#ffffff" android:orientation="vertical"
+	android:orientation="vertical"
 	android:layout_height="fill_parent" android:layout_width="fill_parent">
 
 	<LinearLayout android:layout_width="fill_parent"
@@ -34,7 +34,7 @@
 					android:id="@+id/imgPractice" android:layout_margin="10dip"></ImageView>
 
 				<TableLayout android:id="@+id/TableLayout01"
-					android:layout_height="wrap_content" android:layout_toRightOf="@id/imgPractice"
+					android:layout_height="wrap_content" 
 					android:layout_width="fill_parent" android:layout_marginRight="10dip">
 
 
@@ -109,7 +109,7 @@
 					android:layout_height="wrap_content" android:id="@+id/rowScheduledCompletion">
 					<TextView android:layout_width="wrap_content"
 						android:layout_height="wrap_content" android:text="@string/scheduledCompletionDate"
-						android:textColor="#000000" android:id="@+id/titleScheduledForToday"></TextView>
+						android:textColor="#000000" android:id="@+id/titleScheduledCompletionDate"></TextView>
 
 					<TextView android:layout_height="wrap_content"
 						android:text="02/02/2013" android:textColor="#000000"

diff --git a/MeditationTracker/res/layout/practice_list_item.xml b/MeditationTracker/res/layout/practice_list_item.xml
@@ -4,49 +4,22 @@
 
 	android:layout_width="fill_parent" android:padding="6dip" android:layout_height="wrap_content">
 
-	<!--
-
-		?android:attr/listPreferredItemHeight <ImageView
-		android:id="@+id/icon" android:src="@drawable/icon_refuge"
-		android:layout_height="wrap_content"
-		android:layout_width="wrap_content"/> <ImageView
-		android:id="@+id/ImageView01" android:layout_height="wrap_content"
-		android:src="@drawable/more" android:layout_alignParentRight="true"
-		android:layout_alignParentTop="true"
-		android:layout_width="wrap_content"
-		android:layout_centerVertical="true"></ImageView> <TextView
-		android:id="@+id/secondLine" android:singleLine="true"
-		android:text="Simple application that shows how to use RelativeLayout
-		and let's make it longer than usual"
-		android:layout_width="wrap_content"
-		android:layout_alignParentBottom="true" android:layout_height="26dip"
-		android:layout_toRightOf="@id/icon" android:ellipsize="marquee"/>
-
-		<TextView android:layout_height="wrap_content"
-
-		android:layout_alignParentRight="true"
-		android:layout_alignParentTop="true"
-		android:layout_above="@id/secondLine"
-		android:gravity="center_vertical" android:text="My Application"
-		android:layout_alignWithParentIfMissing="true"
-		android:layout_toRightOf="@id/icon"
-		android:layout_width="wrap_content"/>
-	-->
-
 	<ImageView android:layout_width="wrap_content" android:src="@drawable/icon_refuge"
 		android:layout_height="wrap_content" android:id="@+id/practiceImg"
 		android:scaleType="center"></ImageView>
 
-	<ImageView android:layout_width="wrap_content"
-		android:layout_height="wrap_content" android:src="@drawable/more"
-		android:layout_alignParentRight="true" android:id="@+id/imgMore"></ImageView>
-
-	<TextView android:layout_alignParentTop="true"
-		android:layout_height="wrap_content" android:paddingLeft="6dip"
-		android:textStyle="bold" android:textColor="#000000" android:textSize="25sp"
-		android:layout_toRightOf="@id/practiceImg" android:id="@+id/practiceTitle"
-		android:text="Refuge" android:layout_width="fill_parent"
-		android:layout_toLeftOf="@id/imgMore"></TextView>
+	<TextView
+	    android:id="@+id/practiceTitle"
+	    android:layout_width="fill_parent"
+	    android:layout_height="wrap_content"
+	    android:layout_alignParentTop="true"
+	    android:layout_toRightOf="@id/practiceImg"
+	    android:paddingLeft="6dip"
+	    android:text="Refuge"
+	    android:textColor="#000000"
+	    android:textSize="25sp"
+	    android:textStyle="bold" >
+</TextView>
 
 
 	<TextView android:paddingLeft="6dip" android:textColor="#909090"