Notificaciones

AndroidManifest.xml

@@ -5,7 +5,8 @@
     android:versionName="1.0" >
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>   
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>  
+      <uses-permission android:name="android.permission.VIBRATE" /> 
 
     <uses-sdk android:minSdkVersion="10" />
 

gen/bonsai/app/R.java

@@ -24,78 +24,90 @@ public static final class drawable {
         public static final int fog=0x7f020006;
         public static final int haze=0x7f020007;
         public static final int ic_launcher=0x7f020008;
-        public static final int ic_tab_bonsai=0x7f020009;
-        public static final int ic_tab_calendar=0x7f02000a;
-        public static final int ic_tab_more=0x7f02000b;
-        public static final int ic_tab_selectbonsai=0x7f02000c;
-        public static final int icy=0x7f02000d;
-        public static final int mist=0x7f02000e;
-        public static final int mostly_sunny=0x7f02000f;
-        public static final int sleet=0x7f020010;
-        public static final int smoke=0x7f020011;
-        public static final int snow=0x7f020012;
-        public static final int storm=0x7f020013;
-        public static final int sunny=0x7f020014;
-        public static final int thunderstorm=0x7f020015;
+        public static final int ic_menu_chart=0x7f020009;
+        public static final int ic_menu_filter=0x7f02000a;
+        public static final int ic_menu_flag=0x7f02000b;
+        public static final int ic_tab_bonsai=0x7f02000c;
+        public static final int ic_tab_calendar=0x7f02000d;
+        public static final int ic_tab_more=0x7f02000e;
+        public static final int ic_tab_selectbonsai=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 class id {
-        public static final int ImageView01=0x7f06000d;
-        public static final int bonsaiImage=0x7f060002;
-        public static final int bonsairowtext=0x7f060018;
-        public static final int btnCountry=0x7f060024;
-        public static final int btnPostCode=0x7f060022;
-        public static final int button1=0x7f06001e;
-        public static final int button2=0x7f06001f;
-        public static final int cancelButton=0x7f06002c;
-        public static final int donatebutton=0x7f06002a;
-        public static final int editAge=0x7f06001b;
-        public static final int editCountry=0x7f060023;
-        public static final int editHeight=0x7f06001c;
-        public static final int editName=0x7f060019;
-        public static final int editPostCode=0x7f060021;
-        public static final int familySpinner=0x7f06001a;
-        public static final int footer=0x7f060013;
-        public static final int imageButton1=0x7f060026;
-        public static final int imageButton2=0x7f060017;
-        public static final int imageButton3=0x7f060027;
-        public static final int imageView1=0x7f06002d;
-        public static final int imageView2=0x7f06000a;
-        public static final int imageView4=0x7f060010;
-        public static final int imageWeather=0x7f060008;
-        public static final int linearLayout1=0x7f060001;
-        public static final int photoURLtext=0x7f06001d;
-        public static final int podeButton=0x7f060015;
-        public static final int relativeLayout1=0x7f060025;
-        public static final int saveButton=0x7f06002b;
-        public static final int scrollView1=0x7f060000;
-        public static final int spinner1=0x7f060020;
-        public static final int tableRow1=0x7f060009;
-        public static final int tableRow2=0x7f06000c;
-        public static final int tableRow3=0x7f06000f;
-        public static final int textFamily=0x7f060004;
-        public static final int textName=0x7f060003;
-        public static final int textPrune=0x7f060011;
-        public static final int textTemperature=0x7f060012;
-        public static final int textTransplant=0x7f06000e;
-        public static final int textView1=0x7f060028;
-        public static final int textView2=0x7f060029;
-        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 transplantButton=0x7f060016;
-        public static final int waterButton=0x7f060014;
+        public static final int ImageView01=0x7f07000d;
+        public static final int MnuOpc1=0x7f07002f;
+        public static final int MnuOpc2=0x7f070030;
+        public static final int MnuOpc3=0x7f070031;
+        public static final int bonsaiImage=0x7f070002;
+        public static final int bonsairowtext=0x7f070018;
+        public static final int btnAlarm=0x7f07002e;
+        public static final int btnCountry=0x7f070027;
+        public static final int btnPostCode=0x7f070025;
+        public static final int button1=0x7f070021;
+        public static final int button2=0x7f070022;
+        public static final int cancelButton=0x7f07001b;
+        public static final int donatebutton=0x7f07002c;
+        public static final int editAge=0x7f07001e;
+        public static final int editCountry=0x7f070026;
+        public static final int editHeight=0x7f07001f;
+        public static final int editName=0x7f07001c;
+        public static final int editPostCode=0x7f070024;
+        public static final int familySpinner=0x7f07001d;
+        public static final int footer=0x7f070013;
+        public static final int imageButton1=0x7f070029;
+        public static final int imageButton2=0x7f070017;
+        public static final int imageButton3=0x7f07002a;
+        public static final int imageView1=0x7f07002d;
+        public static final int imageView2=0x7f07000a;
+        public static final int imageView4=0x7f070010;
+        public static final int imageWeather=0x7f070008;
+        public static final int linearLayout1=0x7f070001;
+        public static final int photoURLtext=0x7f070020;
+        public static final int podeButton=0x7f070015;
+        public static final int relativeLayout1=0x7f070028;
+        public static final int saveButton=0x7f07001a;
+        public static final int scrollView1=0x7f070000;
+        public static final int spinner1=0x7f070023;
+        public static final int tableRow1=0x7f070009;
+        public static final int tableRow2=0x7f07000c;
+        public static final int tableRow3=0x7f07000f;
+        public static final int textFamily=0x7f070004;
+        public static final int textName=0x7f070003;
+        public static final int textPrune=0x7f070011;
+        public static final int textTemperature=0x7f070012;
+        public static final int textTransplant=0x7f07000e;
+        public static final int textView1=0x7f070019;
+        public static final int textView2=0x7f07002b;
+        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 transplantButton=0x7f070016;
+        public static final int waterButton=0x7f070014;
     }
     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;

res/layout/bonsai.xml

@@ -11,7 +11,7 @@
 
     <LinearLayout
         android:id="@+id/linearLayout1"
-        android:layout_width="match_parent"
+        android:layout_width="297dp"
         android:layout_height="wrap_content"
         android:orientation="vertical" >
 
@@ -105,9 +105,9 @@
         </LinearLayout>
 
         <TableLayout
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:stretchColumns="2" >
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:stretchColumns="2" >
 
             <TableRow
                 android:id="@+id/tableRow1"
@@ -179,9 +179,11 @@
 
                 <TextView
                   	android:id="@+id/textTemperature"
+                  	 android:layout_width="wrap_content"
+   					 android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:padding="3dip"
-                    android:text="No weather info" />
+                    android:text="No weather info " />
 
             </TableRow>
 

res/layout/selectbonsai.xml

@@ -41,4 +41,7 @@
 </RelativeLayout>
 
 </RelativeLayout>
+
+
+
 

res/layout/task.xml

@@ -31,4 +31,14 @@
 
     </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>

res/menu/menu.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+  xmlns:android="http://schemas.android.com/apk/res/android">
+
+<item android:id="@+id/MnuOpc1" android:title="Opcion1"
+      android:icon="@drawable/ic_menu_chart"></item>
+<item android:id="@+id/MnuOpc2" android:title="Opcion2"
+      android:icon="@drawable/ic_menu_filter"></item>
+<item android:id="@+id/MnuOpc3" android:title="Opcion3"
+      android:icon="@drawable/ic_menu_flag"></item>
+</menu>

src/bonsai/app/BonsaiActivity.java

@@ -9,6 +9,8 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ImageView.ScaleType;
@@ -40,6 +42,16 @@ public class BonsaiActivity extends Activity {
 
 	private String location;
 	private double temperature;
+	public boolean isWeatherAvail() {
+		return weatherAvail;
+	}
+
+
+
+	public double getTemperature() {
+		return temperature;
+	}
+
 	private String imageWeather;
 
 	private final Handler handler = new Handler();
@@ -259,7 +271,7 @@ private void checkPode() {
 
         	// LOGICA DE TRANSPLANTE
         	if(lastpode == 0) textPrune.setText("No info about " + name + " prunes.\nMaybe never pruned.");
-        	else if(age < 2) {	// Los bonsais con menos de dos a�os se suelen defoliar al 50% cada 2 meses, aprox
+        	else if(age < 2) {	// Los bonsais con menos de dos a�os se suelen defoliar al 50% cada 2 meses, aprox
         		if(hoursTime - lastpode > 60 * 24) textPrune.setText("Defoliate your bonsai 50%");
         		else textPrune.setText("Your bonsai prune is not necessary");
         	}
@@ -302,7 +314,7 @@ public void run() {
 
     public void setTempInfo() {
     	try{
-	   		textWeather.setText(Double.toString(w.getTempMedia())+"�C");
+	   		textWeather.setText(Integer.toString(w.getTempMedia())+"ºC");
     	} catch (Exception e) {
 
     	}
@@ -378,28 +390,21 @@ public void setWeatherComment() {
 	         if(s.equals("icy")){
 	         	if(situation.equals("Exterior"))
 	         	textTemperature.setText("Your Bonsai is frozen, please put it indoor");
-	         		}
-	         if(situation.equals("Interior"))
-	         	textTemperature.setText("Your Bonsai would like to have some sunbathing today");
-
-	         if(s.equals("smoke"))
-	         if(s.equals("snow")){
+	         		}	         
+	         if(s.equals("snow")||s.equals("chance_of_snow")){
 	         	if(situation.equals("Exterior"))
 	             	textTemperature.setText("Your Bonsai looks like snowman");
 	         		}
-	         if(s.equals("storm")){
+	         if(s.equals("thunderstorm")){
 	         	if(situation.equals("Exterior"))
 	             	textTemperature.setText("Your Bonsai is scare of thunderstorm");
 	         		}
-	         if(s.equals("sunny")){
+	         if(s.equals("sunny")||s.equals("mostly_sunny")){
 	         	if(situation.equals("Interior"))
 	             	textTemperature.setText("Your Bonsai would like to " +
 	             			"have some sunbathing today");
 	         	}
-	         if(s.equals("thunderstorm")){
-	         	if(situation.equals("Exterior"))
-	             	textTemperature.setText("Your Bonsai is scare of thunderstorm");
-	         }
+
        	} catch (Exception e) {
 
     	}
@@ -449,4 +454,11 @@ public void makeTransplant(View v) {
     	onResume();
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu, menu);
+        return true;
+    }
+
 }

src/bonsai/app/StartActivity.java

@@ -17,7 +17,7 @@ public void onCreate(Bundle savedInstanceState) {
     }
 
     public void goStart(View v) {
-    	// Aqu� sacar�amos el mensaje en el Toast para imprimirlo en un mensajito emergente
+    	// Aquí sacar�amos el mensaje en el Toast para imprimirlo en un mensajito emergente
     	//Toast.makeText(this, "Donation Webpage", Toast.LENGTH_LONG).show();
     	finish();