Skip to content

Commit

Permalink
Various changes, see "CURRENT COMMIT NOTES" in README.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mgoulet
mgoulet committed Jan 3, 2012
1 parent 2002c5d commit 24a049a
Show file tree
Hide file tree
Showing 10 changed files with 162 additions and 136 deletions.
21 changes: 7 additions & 14 deletions README
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,23 @@
------------------------
CURRENT COMMIT NOTES
------------------------
-fixed date fields
-portrait mode only
-removed scorecard functionality (keep app simple)
-refactoring:
-remove unnecessary imports
-minor refactoring across the project
-change KEY_ROWID with proper ids from the defined constants...
-move COURSE_STRUCTURE into Db object.
-cleanup constants for db tables access - should all reside in DbAdapter, not in activities classes.
-refactor ZeroIronCourseEdit like ZeroIronGameEdit (onClickListeners and stuff)
-refactor dbAdapter as global Application Context 'singleton'
-added score to game object
-fixed minor issues

------------------------
REMAINING CORE FEATURES:
------------------------
-Ads support
-Export to XML/DB on local/SD card
-Backups
-Export / load from DB format
-Export to XML on local/SD card
-Add settings to app
-Twitter support
-Ads support

------------------------
OUTSTANDING ISSUES:
------------------------
-Add row sorting
-Add score to game object
-DB value validation on certain fields
-fix/adjust image in games list
-move to game list once game is created from a selected course
Expand Down
100 changes: 52 additions & 48 deletions gen/com/example/android/ZeroIron/R.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,88 +33,92 @@ public static final class drawable {
public static final int b_ok=0x7f020006;
public static final int ball32=0x7f020007;
public static final int ball48=0x7f020008;
public static final int calendar_1=0x7f020009;
public static final int game_complete=0x7f02000a;
public static final int gear32=0x7f02000b;
public static final int golf32=0x7f02000c;
public static final int golf_course=0x7f02000d;
public static final int golfback1=0x7f02000e;
public static final int golfback2=0x7f02000f;
public static final int golfbak1=0x7f020010;
public static final int golfbak_half=0x7f020011;
public static final int golfbak_half2=0x7f020012;
public static final int golfnight=0x7f020013;
public static final int icon=0x7f020014;
public static final int mainbackground=0x7f020015;
public static final int marty200x200=0x7f020016;
public static final int pack32=0x7f020017;
public static final int splash1=0x7f020018;
public static final int time_1=0x7f020019;
public static final int w_clear=0x7f02001a;
public static final int w_cloudy=0x7f02001b;
public static final int w_cloudy1=0x7f02001c;
public static final int w_mixed=0x7f02001d;
public static final int w_scattered=0x7f02001e;
public static final int w_showers=0x7f02001f;
public static final int w_storm=0x7f020020;
public static final int calendar=0x7f020009;
public static final int calendar_1=0x7f02000a;
public static final int clock=0x7f02000b;
public static final int game_complete=0x7f02000c;
public static final int gear32=0x7f02000d;
public static final int golf32=0x7f02000e;
public static final int golf_course=0x7f02000f;
public static final int golfback1=0x7f020010;
public static final int golfback2=0x7f020011;
public static final int golfbak1=0x7f020012;
public static final int golfbak_half=0x7f020013;
public static final int golfbak_half2=0x7f020014;
public static final int golfnight=0x7f020015;
public static final int icon=0x7f020016;
public static final int mainbackground=0x7f020017;
public static final int marty200x200=0x7f020018;
public static final int pack32=0x7f020019;
public static final int splash1=0x7f02001a;
public static final int time_1=0x7f02001b;
public static final int w_clear=0x7f02001c;
public static final int w_cloudy=0x7f02001d;
public static final int w_cloudy1=0x7f02001e;
public static final int w_mixed=0x7f02001f;
public static final int w_scattered=0x7f020020;
public static final int w_showers=0x7f020021;
public static final int w_storm=0x7f020022;
}
public static final class id {
public static final int TextNotesLabel=0x7f080020;
public static final int cancel_button=0x7f080029;
public static final int checkBox1=0x7f080034;
public static final int deleteButton=0x7f080030;
public static final int TextNotesLabel=0x7f080022;
public static final int TextScoreLabel=0x7f080020;
public static final int cancel_button=0x7f08002b;
public static final int checkBox1=0x7f080036;
public static final int deleteButton=0x7f080032;
public static final int deleteGameButton=0x7f080015;
public static final int editButton=0x7f08002f;
public static final int editButton=0x7f080031;
public static final int editCourseLocation=0x7f08000b;
public static final int editCourseName=0x7f08000a;
public static final int editGameButton=0x7f080014;
public static final int editGameDateButton=0x7f08001c;
public static final int editGameDateField=0x7f08001b;
public static final int editGameDateLabel=0x7f08001a;
public static final int editGameName=0x7f080019;
public static final int editGameNotes=0x7f080021;
public static final int editGameNotes=0x7f080023;
public static final int editGameScore=0x7f080021;
public static final int editGameTimeButton=0x7f08001f;
public static final int editGameTimeField=0x7f08001e;
public static final int editGameTimeLabel=0x7f08001d;
public static final int hole=0x7f080031;
public static final int hole=0x7f080033;
public static final int imageCancel=0x7f080013;
public static final int imageNextArrow=0x7f080007;
public static final int imageOk=0x7f080012;
public static final int imageStatus=0x7f08002c;
public static final int imageView1=0x7f080036;
public static final int par=0x7f080032;
public static final int imageView1=0x7f080038;
public static final int par=0x7f080034;
public static final int radioGroup1=0x7f08000c;
public static final int radioPar0=0x7f08000d;
public static final int radioPar1=0x7f08000e;
public static final int radioPar2=0x7f08000f;
public static final int radioSize0=0x7f080010;
public static final int radioSize1=0x7f080011;
public static final int save_button=0x7f080028;
public static final int score=0x7f080033;
public static final int score_text=0x7f080026;
public static final int spinner_par=0x7f080025;
public static final int spinner_score=0x7f080027;
public static final int splash=0x7f080037;
public static final int save_button=0x7f08002a;
public static final int score=0x7f080035;
public static final int score_text=0x7f080028;
public static final int spinner_par=0x7f080027;
public static final int spinner_score=0x7f080029;
public static final int splash=0x7f080039;
public static final int textBuffer=0x7f080008;
public static final int textCourseLabel=0x7f080009;
public static final int textCourseName=0x7f080000;
public static final int textCourseNameLabel=0x7f080016;
public static final int textCourseNameValue=0x7f080017;
public static final int textGameDate=0x7f08002b;
public static final int textGameName=0x7f08002a;
public static final int textGameDate=0x7f08002d;
public static final int textGameName=0x7f08002c;
public static final int textGameNameLabel=0x7f080018;
public static final int textGameNotes=0x7f08002e;
public static final int textGameNotesLabel=0x7f08002d;
public static final int textGameNotes=0x7f080030;
public static final int textGameNotesLabel=0x7f08002f;
public static final int textGameScore=0x7f08002e;
public static final int textLocationLabel=0x7f080001;
public static final int textLocationValue=0x7f080002;
public static final int textParLabel=0x7f080003;
public static final int textParValue=0x7f080004;
public static final int textSizeLabel=0x7f080005;
public static final int textSizeValue=0x7f080006;
public static final int textView1=0x7f080035;
public static final int textView_holeLabel=0x7f080022;
public static final int textView_holeValue=0x7f080023;
public static final int textView_par=0x7f080024;
public static final int textView1=0x7f080037;
public static final int textView_holeLabel=0x7f080024;
public static final int textView_holeValue=0x7f080025;
public static final int textView_par=0x7f080026;
}
public static final class layout {
public static final int zeroiron_courselist=0x7f030000;
Expand Down
Binary file added res/drawable/calendar.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable/clock.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
94 changes: 55 additions & 39 deletions res/layout/zeroiron_editgame.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,50 +14,66 @@
<TextView android:id="@+id/textCourseNameValue" android:layout_height="20pt" android:textSize="8pt" android:textAppearance="?android:attr/textAppearanceLarge" android:layout_width="fill_parent" android:text="COURSE NAME"></TextView>

<TextView android:textColor="#FFFFFF" android:id="@+id/textGameNameLabel" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:layout_width="wrap_content" android:textStyle="bold" android:text="Game Name"></TextView>
<EditText android:layout_width="match_parent" android:id="@+id/editGameName" android:layout_height="wrap_content">
<EditText android:layout_width="match_parent" android:id="@+id/editGameName" android:layout_height="wrap_content"
android:maxLength="30">
<requestFocus></requestFocus>
</EditText>

<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_height="wrap_content">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="70">
<TextView android:textAppearance="?android:attr/textAppearanceLarge" android:layout_height="wrap_content" android:layout_width="wrap_content" android:textStyle="bold" android:text="Date" android:textColor="#FFFFFF" android:id="@+id/editGameDateLabel"></TextView>
<TextView android:textAppearance="?android:attr/textAppearanceLarge" android:layout_height="wrap_content" android:layout_width="wrap_content" android:text="--/--/----" android:textColor="#FFFFFF" android:id="@+id/editGameDateField"></TextView>
</LinearLayout>
<ImageButton android:src="@drawable/calendar_1" android:layout_height="wrap_content" android:id="@+id/editGameDateButton" android:layout_width="wrap_content"></ImageButton>
</LinearLayout>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_height="wrap_content">
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_height="wrap_content">

<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="70">
<TextView android:textAppearance="?android:attr/textAppearanceLarge" android:layout_height="wrap_content" android:layout_width="wrap_content" android:textStyle="bold" android:text="Time" android:textColor="#FFFFFF" android:id="@+id/editGameTimeLabel"></TextView>
<TextView android:textAppearance="?android:attr/textAppearanceLarge" android:layout_height="wrap_content" android:layout_width="wrap_content" android:text="--:-- -M" android:textColor="#FFFFFF" android:id="@+id/editGameTimeField" android:layout_weight="80"></TextView>
</LinearLayout>
<ImageButton android:src="@drawable/time_1" android:layout_height="wrap_content" android:id="@+id/editGameTimeButton" android:layout_width="wrap_content"></ImageButton>
</LinearLayout>
<TextView android:textColor="#FFFFFF" android:id="@+id/TextNotesLabel" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:layout_width="wrap_content" android:textStyle="bold" android:text="Notes"></TextView>
<EditText android:layout_width="match_parent" android:layout_height="40pt" android:id="@+id/editGameNotes">
<requestFocus></requestFocus>
</EditText>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_height="wrap_content">
</LinearLayout>
<RadioGroup android:id="@+id/radioGroup1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
</RadioGroup>
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="60">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="60">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="60">
<TextView android:textAppearance="?android:attr/textAppearanceLarge" android:layout_height="wrap_content" android:layout_width="wrap_content" android:textStyle="bold" android:text="Date" android:textColor="#FFFFFF" android:id="@+id/editGameDateLabel"></TextView>
<TextView android:textAppearance="?android:attr/textAppearanceLarge" android:layout_height="wrap_content" android:layout_width="wrap_content" android:text="--/--/----" android:textColor="#FFFFFF" android:id="@+id/editGameDateField"></TextView>
</LinearLayout>
<ImageButton android:src="@drawable/calendar" android:layout_height="match_parent" android:id="@+id/editGameDateButton" android:layout_width="110px"/>
</LinearLayout>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="60">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="60">
<TextView android:textAppearance="?android:attr/textAppearanceLarge" android:layout_height="wrap_content" android:layout_width="wrap_content" android:textStyle="bold" android:text="Time" android:textColor="#FFFFFF" android:id="@+id/editGameTimeLabel"></TextView>
<TextView android:textAppearance="?android:attr/textAppearanceLarge" android:layout_height="wrap_content" android:layout_width="wrap_content" android:text="--:-- -M" android:textColor="#FFFFFF" android:id="@+id/editGameTimeField"></TextView>
</LinearLayout>
<ImageButton android:src="@drawable/clock" android:layout_height="match_parent" android:id="@+id/editGameTimeButton" android:layout_width="110px"></ImageButton>
</LinearLayout>
</LinearLayout>

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="wrap_content" android:layout_height="match_parent">
<TextView android:layout_height="wrap_content" android:text="Score" android:layout_width="wrap_content" android:layout_centerHorizontal="true" android:textStyle="bold" android:id="@+id/TextScoreLabel" android:textAppearance="?android:attr/textAppearanceLarge" android:textColor="#FFFFFF"></TextView>
<EditText android:layout_width="110dp" android:layout_below="@+id/TextScoreLabel" android:gravity="center"
android:textSize="30dp" android:text="" android:inputType="number" android:id="@+id/editGameScore"
android:layout_height="110dp" android:textStyle="bold" android:maxLength="3"></EditText>
</RelativeLayout>
</LinearLayout>

<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_height="104dp">
<TextView android:textColor="#FFFFFF" android:id="@+id/TextNotesLabel" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:layout_width="wrap_content" android:textStyle="bold" android:text="Notes"></TextView>
<EditText android:layout_width="match_parent" android:id="@+id/editGameNotes" android:layout_height="80dp" android:maxLength="20" android:text=""
android:singleLine="false" android:lines="2"/>
</LinearLayout>
<TableLayout android:orientation="horizontal"
android:stretchColumns="0, 1"
android:layout_height="87dp"
Expand Down
13 changes: 8 additions & 5 deletions res/layout/zeroiron_gameslist_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,14 @@
android:textSize="6pt"
android:text="-----------"
android:textAppearance="?android:attr/textAppearanceMedium"/>
</LinearLayout>
<ImageView android:id="@+id/imageStatus"
android:layout_width="48dp"
android:layout_weight="20"
android:src="@drawable/game_complete" android:layout_height="48dp"/>
</LinearLayout>
<RelativeLayout
android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="match_parent">
<TextView android:id="@+id/textGameScore"
android:textSize="10pt" android:textStyle="bold"
android:layout_centerHorizontal="true" android:layout_width="wrap_content" android:gravity="center"
android:layout_height="fill_parent" android:text="123 " android:textAppearance="?android:attr/textAppearanceMedium"/>
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="20pt"
Expand Down
Loading

0 comments on commit 24a049a

Please sign in to comment.