Changeset 98

Timestamp:

02/03/09 10:38:49 (12 months ago)

Author:

dmyung

Message:

daterange fix for button layout

some tweaks for colors that didn't seem to work.

Location:

trunk/rapidandroid/org.rapidandroid

Files:

• AndroidManifest.xml (modified) (1 diff)
• res/layout/date_range.xml (modified) (1 diff)
• res/values/colors.xml (modified) (1 diff)
• res/values/strings.xml (modified) (1 diff)
• src/org/rapidandroid/activity/DateRange.java (modified) (3 diffs)
• src/org/rapidandroid/view/SummaryCursorView.java (modified) (2 diffs)

trunk/rapidandroid/org.rapidandroid/AndroidManifest.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        android:versionCode="1" android:versionName="1.0.0" package="org.rapidandroid">
+        package="org.rapidandroid" android:versionName="0.5.0" android:versionCode="97">
 
 

trunk/rapidandroid/org.rapidandroid/res/layout/date_range.xml

@@ -6 +6 @@
                 android:layout_width="fill_parent">
                 <Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/btn_daterange_startdate" android:id="@+id/range_btn_startdate"></Button>
-                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/txv_startdate" android:layout_weight="2" android:textSize="16sp"></TextView>
+                
         
-</TableRow>
+<Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/btn_daterange_enddate" android:id="@+id/range_btn_enddate"></Button></TableRow>
         
 
         <TableRow android:id="@+id/TableRow02" android:layout_height="wrap_content"
-                android:layout_width="fill_parent">
+                android:layout_width="fill_parent"><TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/txv_startdate" android:textSize="16sp" android:layout_gravity="center_horizontal" android:layout_weight="1"></TextView>
                 
                 <TextView android:id="@+id/txv_enddate" android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" android:layout_weight="2" android:textSize="16sp"></TextView>
-        <Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/btn_daterange_enddate" android:id="@+id/range_btn_enddate"></Button>
+                        android:layout_height="wrap_content" android:textSize="16sp" android:layout_gravity="center_horizontal" android:layout_weight="1"></TextView>
+        
 </TableRow>
         
         <TextView android:id="@+id/TextView02" android:layout_width="wrap_content"
                 android:layout_height="20px" android:text=" " ></TextView>
-        <Button android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:id="@+id/range_btn_lastday"
-                android:text="@string/range_btn_lastday">
-        </Button>
-                <Button android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" android:id="@+id/range_btn_lastweek"
-                        android:text="@string/range_btn_lastweek"></Button>
-                <Button android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" android:id="@+id/range_btn_last_month"
-                        android:text="@string/range_btn_lastmonth"></Button>
+        
+                
+                
 
-<Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/range_btn_last_threemonth" android:text="@string/range_btn_lastthreemonth"></Button>
+
+
+<TableRow android:id="@+id/TableRow04" android:layout_height="wrap_content" android:layout_width="fill_parent"><Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/range_btn_lastday" android:text="@string/range_btn_lastday" android:layout_weight="1">
+        </Button><Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/range_btn_lastweek" android:text="@string/range_btn_lastweek" android:layout_weight="1"></Button></TableRow><TableRow android:id="@+id/TableRow03" android:layout_height="wrap_content" android:layout_width="fill_parent"><Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/range_btn_last_month" android:text="@string/range_btn_lastmonth" android:layout_weight="1"></Button><Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/range_btn_last_threemonth" android:text="@string/range_btn_lastthreemonth" android:layout_weight="1"></Button></TableRow>
+<Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/range_btn_entire_range" android:text="@string/btn_entire_range"></Button>
 </TableLayout>

trunk/rapidandroid/org.rapidandroid/res/values/colors.xml

@@ -30 +30 @@
     <color name="solid_yellow">#ffffff00</color>
 
-<color name="background_red">#C14747</color>
-<color name="background_gray">#636363</color>
+<color name="background_red">#C59774</color>
+<color name="background_gray">#738BC4</color>
 </resources>

trunk/rapidandroid/org.rapidandroid/res/values/strings.xml

@@ -43 +43 @@
 <string name="btn_daterange_startdate">Start Date</string>
 <string name="btn_daterange_enddate">End Date</string>
-<string name="range_btn_lastthreemonth">End Date</string>
+<string name="range_btn_lastthreemonth">Three Months</string>
+<string name="btn_entire_range">Entire Range</string>
 </resources>

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/activity/DateRange.java

@@ -77 +77 @@
     private int mEndDay;
     
- 
-
+    int mStartBeginningYear;
+    int mStartBeginningMonth;
+    int mStartBeginningDay;
         
         static final int DATE_DIALOG_START_ID = 0;
@@ -112 +113 @@
                 Calendar e = Calendar.getInstance();
                 e.setTime(mEndDate);
+                
+                mStartBeginningYear = s.get(Calendar.YEAR);
+                mStartBeginningMonth = s.get(Calendar.MONTH);
+                mStartBeginningDay = s.get(Calendar.DAY_OF_MONTH);              
                 
                 
@@ -260 +265 @@
                                 Calendar newStart = Calendar.getInstance(); 
                                 newStart.set(Calendar.MONTH, newEnd.get(Calendar.MONTH) - 3);
+                                setUpdateCalendar(newStart,newEnd);
+                        }
+                });
+                
+                Button btnAll = (Button) findViewById(R.id.range_btn_entire_range);
+                btnAll.setOnClickListener(new OnClickListener() {
+
+                        public void onClick(View v) {
+                                Calendar newEnd = Calendar.getInstance();
+                                Calendar newStart = Calendar.getInstance();
+                                newStart.set(Calendar.YEAR, mStartBeginningYear);
+                                newStart.set(Calendar.MONTH, mStartBeginningMonth);
+                                newStart.set(Calendar.DATE, mStartBeginningDay);
                                 setUpdateCalendar(newStart,newEnd);
                         }

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/view/SummaryCursorView.java

@@ -88 +88 @@
                         TextView txvFieldName = new TextView(getContext());                     
                         txvFieldName.setTextSize(14);
+                        txvFieldName.setBackgroundColor(R.color.background_red);
                         txvFieldName.setGravity(Gravity.LEFT);
                         mFieldLabels[i] = txvFieldName;
@@ -94 +95 @@
                         txvFieldData.setGravity(Gravity.LEFT);
                         txvFieldData.setTextSize(14);                   
+                        txvFieldData.setBackgroundColor(R.color.background_red);
                         mFieldValues[i] = txvFieldData;