Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

<uses-permission android:name="android.permission.VIBRATE" />
<uses-sdk android:minSdkVersion="10" />

<application
android:icon="@drawable/ic_launcher"
android:icon="@drawable/bonsai"
android:label="@string/app_name" >
<activity
android:name=".AndroidProjectActivity"
Expand All @@ -21,6 +21,13 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>


<receiver android:name=".MyReceiver">
<intent-filter>

</intent-filter>
</receiver>

<activity
android:name=".SelectBonsaiActivity">
Expand All @@ -47,6 +54,10 @@
android:name=".StartActivity" >
</activity>

<service android:name=".AlarmChecker" />



</application>

</manifest>
Binary file modified bin/AndProject.apk
Binary file not shown.
Binary file modified bin/classes.dex
Binary file not shown.
Binary file modified bin/classes/bonsai/app/AndroidProjectActivity.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/BonsaiActivity$1.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/BonsaiActivity$2.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/BonsaiActivity.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/EditBonsaiActivity$1.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/EditBonsaiActivity$2.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/EditBonsaiActivity$3.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/EditBonsaiActivity$4.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/EditBonsaiActivity$5.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/EditBonsaiActivity.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/MoreActivity.class
Binary file not shown.
Binary file added bin/classes/bonsai/app/MyReceiver.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/R$drawable.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/R$id.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/R$layout.class
Binary file not shown.
Binary file added bin/classes/bonsai/app/R$menu.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/R$string.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/R.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/SelectBonsaiActivity.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/StartActivity.class
Binary file not shown.
Binary file added bin/classes/bonsai/app/TaskActivity$1.class
Binary file not shown.
Binary file added bin/classes/bonsai/app/TaskActivity$2.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/TaskActivity.class
Binary file not shown.
Binary file added bin/classes/bonsai/app/alarm/AlarmChecker$1.class
Binary file not shown.
Binary file added bin/classes/bonsai/app/alarm/AlarmChecker.class
Binary file not shown.
Binary file added bin/classes/bonsai/app/alarm/CheckRiego.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/weather/Weather.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/weather/XmlHandler.class
Binary file not shown.
Binary file modified bin/res/drawable-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified bin/res/drawable-ldpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified bin/res/drawable-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified bin/res/drawable-xhdpi/ic_launcher.png
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 bin/res/drawable/bonsai.png
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 bin/res/drawable/donate.png
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 bin/res/drawable/ic_launche.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified bin/res/drawable/ic_launcher.png
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 bin/res/drawable/ic_menu_help.png
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 bin/res/drawable/ic_task.png
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 bin/res/drawable/task.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified bin/resources.ap_
Binary file not shown.
174 changes: 94 additions & 80 deletions gen/bonsai/app/R.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,92 +15,105 @@ public static final class array {
public static final class attr {
}
public static final class drawable {
public static final int chance_of_rain=0x7f020000;
public static final int chance_of_snow=0x7f020001;
public static final int chance_of_storm=0x7f020002;
public static final int cloudy=0x7f020003;
public static final int dust=0x7f020004;
public static final int escaledlogo=0x7f020005;
public static final int fog=0x7f020006;
public static final int haze=0x7f020007;
public static final int ic_launcher=0x7f020008;
public static final int ic_pode=0x7f020009;
public static final int ic_tab_bonsai=0x7f02000a;
public static final int ic_tab_calendar=0x7f02000b;
public static final int ic_tab_more=0x7f02000c;
public static final int ic_tab_selectbonsai=0x7f02000d;
public static final int ic_transplant=0x7f02000e;
public static final int ic_water=0x7f02000f;
public static final int icy=0x7f020010;
public static final int mist=0x7f020011;
public static final int mostly_sunny=0x7f020012;
public static final int sleet=0x7f020013;
public static final int smoke=0x7f020014;
public static final int snow=0x7f020015;
public static final int storm=0x7f020016;
public static final int sunny=0x7f020017;
public static final int thunderstorm=0x7f020018;
public static final int bonsai=0x7f020000;
public static final int chance_of_rain=0x7f020001;
public static final int chance_of_snow=0x7f020002;
public static final int chance_of_storm=0x7f020003;
public static final int cloudy=0x7f020004;
public static final int donate=0x7f020005;
public static final int dust=0x7f020006;
public static final int escaledlogo=0x7f020007;
public static final int fog=0x7f020008;
public static final int haze=0x7f020009;
public static final int ic_launche=0x7f02000a;
public static final int ic_launcher=0x7f02000b;
public static final int ic_menu_help=0x7f02000c;
public static final int ic_pode=0x7f02000d;
public static final int ic_tab_bonsai=0x7f02000e;
public static final int ic_tab_calendar=0x7f02000f;
public static final int ic_tab_more=0x7f020010;
public static final int ic_tab_selectbonsai=0x7f020011;
public static final int ic_task=0x7f020012;
public static final int ic_transplant=0x7f020013;
public static final int ic_water=0x7f020014;
public static final int icy=0x7f020015;
public static final int mist=0x7f020016;
public static final int mostly_sunny=0x7f020017;
public static final int sleet=0x7f020018;
public static final int smoke=0x7f020019;
public static final int snow=0x7f02001a;
public static final int storm=0x7f02001b;
public static final int sunny=0x7f02001c;
public static final int task=0x7f02001d;
public static final int thunderstorm=0x7f02001e;
}
public static final class id {
public static final int ImageView01=0x7f06000d;
public static final int bonsaiImage=0x7f060002;
public static final int bonsairowtext=0x7f06001b;
public static final int btnCountry=0x7f060027;
public static final int btnPostCode=0x7f060025;
public static final int button1=0x7f060021;
public static final int button2=0x7f060022;
public static final int cancelButton=0x7f06002e;
public static final int donatebutton=0x7f06002c;
public static final int editAge=0x7f06001e;
public static final int editCountry=0x7f060026;
public static final int editHeight=0x7f06001f;
public static final int editName=0x7f06001c;
public static final int editPostCode=0x7f060024;
public static final int familySpinner=0x7f06001d;
public static final int footer=0x7f060016;
public static final int imageButton1=0x7f060019;
public static final int imageButton2=0x7f06001a;
public static final int imageButton3=0x7f060029;
public static final int imageView1=0x7f06002f;
public static final int imageView2=0x7f06000a;
public static final int imageView4=0x7f060010;
public static final int imageView5=0x7f060013;
public static final int imageWeather=0x7f060008;
public static final int linearLayout1=0x7f060001;
public static final int photoURLtext=0x7f060020;
public static final int podeButton=0x7f060018;
public static final int relativeLayout1=0x7f060028;
public static final int saveButton=0x7f06002d;
public static final int scrollMore=0x7f060015;
public static final int scrollView1=0x7f060000;
public static final int spinner1=0x7f060023;
public static final int tableRow1=0x7f060009;
public static final int tableRow2=0x7f06000c;
public static final int tableRow3=0x7f06000f;
public static final int tableRow4=0x7f060012;
public static final int textFamily=0x7f060004;
public static final int textName=0x7f060003;
public static final int textPrune=0x7f06000e;
public static final int textTemperature=0x7f060014;
public static final int textTransplant=0x7f060011;
public static final int textView1=0x7f06002a;
public static final int textView2=0x7f06002b;
public static final int textView3=0x7f060006;
public static final int textWater=0x7f06000b;
public static final int textYears=0x7f060005;
public static final int textweather=0x7f060007;
public static final int waterButton=0x7f060017;
public static final int ImageView01=0x7f07000d;
public static final int MnuOpc1=0x7f070031;
public static final int bonsaiImage=0x7f070002;
public static final int bonsairowtext=0x7f07001b;
public static final int btnAlarm=0x7f070030;
public static final int btnCountry=0x7f07002a;
public static final int btnPostCode=0x7f070028;
public static final int button1=0x7f070024;
public static final int button2=0x7f070025;
public static final int cancelButton=0x7f07001e;
public static final int donatebutton=0x7f07002e;
public static final int editAge=0x7f070021;
public static final int editCountry=0x7f070029;
public static final int editHeight=0x7f070022;
public static final int editName=0x7f07001f;
public static final int editPostCode=0x7f070027;
public static final int familySpinner=0x7f070020;
public static final int footer=0x7f070016;
public static final int imageButton1=0x7f070019;
public static final int imageButton2=0x7f07001a;
public static final int imageButton3=0x7f07002c;
public static final int imageView1=0x7f07002f;
public static final int imageView2=0x7f07000a;
public static final int imageView4=0x7f070010;
public static final int imageView5=0x7f070013;
public static final int imageWeather=0x7f070008;
public static final int linearLayout1=0x7f070001;
public static final int photoURLtext=0x7f070023;
public static final int podeButton=0x7f070018;
public static final int relativeLayout1=0x7f07002b;
public static final int saveButton=0x7f07001d;
public static final int scrollMore=0x7f070015;
public static final int scrollView1=0x7f070000;
public static final int spinner1=0x7f070026;
public static final int tableRow1=0x7f070009;
public static final int tableRow2=0x7f07000c;
public static final int tableRow3=0x7f07000f;
public static final int tableRow4=0x7f070012;
public static final int textFamily=0x7f070004;
public static final int textName=0x7f070003;
public static final int textPrune=0x7f07000e;
public static final int textTemperature=0x7f070014;
public static final int textTransplant=0x7f070011;
public static final int textView1=0x7f07001c;
public static final int textView2=0x7f07002d;
public static final int textView3=0x7f070006;
public static final int textWater=0x7f07000b;
public static final int textYears=0x7f070005;
public static final int textweather=0x7f070007;
public static final int waterButton=0x7f070017;
}
public static final class layout {
public static final int bonsai=0x7f030000;
public static final int bonsai_row=0x7f030001;
public static final int editbonsai=0x7f030002;
public static final int main=0x7f030003;
public static final int more=0x7f030004;
public static final int selectbonsai=0x7f030005;
public static final int start=0x7f030006;
public static final int task=0x7f030007;
public static final int task_row=0x7f030008;
public static final int calendar=0x7f030002;
public static final int editbonsai=0x7f030003;
public static final int gallery=0x7f030004;
public static final int main=0x7f030005;
public static final int more=0x7f030006;
public static final int selectbonsai=0x7f030007;
public static final int start=0x7f030008;
public static final int task=0x7f030009;
public static final int task_row=0x7f03000a;
}
public static final class menu {
public static final int menu=0x7f060000;
}
public static final class string {
public static final int app_name=0x7f040000;
Expand All @@ -112,6 +125,7 @@ public static final class string {
public static final int edit_button=0x7f04001a;
public static final int image_desc_bonsai=0x7f04000b;
public static final int loading_text=0x7f040011;
public static final int menu_help=0x7f04001e;
public static final int pode_button=0x7f040018;
public static final int pode_no_info=0x7f040014;
public static final int save_button=0x7f04001b;
Expand Down
Binary file modified res/drawable-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-ldpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xhdpi/ic_launcher.png
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/bonsai.png
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/donate.png
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/ic_launche.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable/ic_launcher.png
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/ic_menu_help.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions res/drawable/ic_tab_bonsai.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- When selected, use grey -->
<item android:drawable="@drawable/ic_launcher"
<item android:drawable="@drawable/bonsai"
android:state_selected="true" />
<!-- When not selected, use white-->
<item android:drawable="@drawable/ic_launcher" />
<item android:drawable="@drawable/bonsai" />
</selector>
4 changes: 2 additions & 2 deletions res/drawable/ic_tab_calendar.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- When selected, use grey -->
<item android:drawable="@drawable/ic_launcher"
<item android:drawable="@drawable/ic_task"
android:state_selected="true" />
<!-- When not selected, use white-->
<item android:drawable="@drawable/ic_launcher" />
<item android:drawable="@drawable/ic_task" />
</selector>
4 changes: 2 additions & 2 deletions res/drawable/ic_tab_more.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- When selected, use grey -->
<item android:drawable="@drawable/ic_launcher"
<item android:drawable="@drawable/donate"
android:state_selected="true" />
<!-- When not selected, use white-->
<item android:drawable="@drawable/ic_launcher" />
<item android:drawable="@drawable/donate" />
</selector>
4 changes: 2 additions & 2 deletions res/drawable/ic_tab_selectbonsai.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- When selected, use grey -->
<item android:drawable="@drawable/ic_launcher"
<item android:drawable="@drawable/ic_launche"
android:state_selected="true" />
<!-- When not selected, use white-->
<item android:drawable="@drawable/ic_launcher" />
<item android:drawable="@drawable/ic_launche" />
</selector>
Binary file added res/drawable/ic_task.png
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/task.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 8 additions & 1 deletion res/layout/editbonsai.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical" >

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -244,4 +250,5 @@
</LinearLayout>
</RelativeLayout>

</RelativeLayout>
</RelativeLayout>
</LinearLayout>
10 changes: 10 additions & 0 deletions res/layout/task.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,15 @@
android:textAppearance="?android:attr/textAppearanceSmall"/>

</LinearLayout>

<Button
android:id="@+id/btnAlarm"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:text="Alarm OFF" />


</RelativeLayout>
7 changes: 7 additions & 0 deletions res/menu/menu.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<menu
xmlns:android="http://schemas.android.com/apk/res/android">

<item android:id="@+id/MnuOpc1" android:title="@string/menu_help"
android:icon="@drawable/ic_menu_help"></item>
</menu>
1 change: 1 addition & 0 deletions res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<string name="save_button">"Save"</string>
<string name="delete_button">"Delete"</string>
<string name="cancel_button">"Cancel"</string>
<string name="menu_help">"What it is?"</string>



Expand Down
8 changes: 4 additions & 4 deletions src/bonsai/app/AndroidProjectActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,28 +47,28 @@ public void onCreate(Bundle savedInstanceState) {

// Create an Intent to launch an Activity for the tab (to be reused)
intent = new Intent().setClass(this, SelectBonsaiActivity.class);
spec = tabHost.newTabSpec("all").setIndicator("All",
spec = tabHost.newTabSpec("all").setIndicator("",
res.getDrawable(R.drawable.ic_tab_selectbonsai))
.setContent(intent);
tabHost.addTab(spec);

// Initialize a TabSpec for each tab and add it to the TabHost

intent = new Intent().setClass(this, BonsaiActivity.class);
spec = tabHost.newTabSpec("bonsai").setIndicator("Bonsai",
spec = tabHost.newTabSpec("bonsai").setIndicator("",
res.getDrawable(R.drawable.ic_tab_bonsai))
.setContent(intent);
tabHost.addTab(spec);

// Do the same for the other tabs
intent = new Intent().setClass(this, TaskActivity.class);
spec = tabHost.newTabSpec("calendar").setIndicator("Today Tasks",
spec = tabHost.newTabSpec("calendar").setIndicator("",
res.getDrawable(R.drawable.ic_tab_calendar))
.setContent(intent);
tabHost.addTab(spec);

intent = new Intent().setClass(this, MoreActivity.class);
spec = tabHost.newTabSpec("more").setIndicator("More",
spec = tabHost.newTabSpec("more").setIndicator("",
res.getDrawable(R.drawable.ic_tab_more))
.setContent(intent);
tabHost.addTab(spec);
Expand Down
Loading