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
4 changes: 4 additions & 0 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@
android:name=".StartActivity" >
</activity>

<activity
android:name=".EnvioMailActivity" >
</activity>

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


Expand Down
Binary file added Entrega.zip
Binary file not shown.
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.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/EditBonsaiActivity.class
Binary file not shown.
Binary file added bin/classes/bonsai/app/EnvioMailActivity$1.class
Binary file not shown.
Binary file added bin/classes/bonsai/app/EnvioMailActivity.class
Binary file not shown.
Binary file added bin/classes/bonsai/app/MoreActivity$1.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/MoreActivity.class
Binary file not shown.
Binary file modified 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 modified 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/SelectBonsaiActivity.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/StartActivity.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/TaskActivity.class
Binary file not shown.
Binary file modified bin/classes/bonsai/app/weather/Weather.class
Binary file not shown.
Binary file added bin/res/drawable/disease.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.
91 changes: 54 additions & 37 deletions gen/bonsai/app/R.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,55 +20,67 @@ public static final class drawable {
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 int disease=0x7f020005;
public static final int donate=0x7f020006;
public static final int dust=0x7f020007;
public static final int escaledlogo=0x7f020008;
public static final int fog=0x7f020009;
public static final int haze=0x7f02000a;
public static final int ic_launche=0x7f02000b;
public static final int ic_launcher=0x7f02000c;
public static final int ic_menu_help=0x7f02000d;
public static final int ic_pode=0x7f02000e;
public static final int ic_tab_bonsai=0x7f02000f;
public static final int ic_tab_calendar=0x7f020010;
public static final int ic_tab_more=0x7f020011;
public static final int ic_tab_selectbonsai=0x7f020012;
public static final int ic_task=0x7f020013;
public static final int ic_transplant=0x7f020014;
public static final int ic_water=0x7f020015;
public static final int icy=0x7f020016;
public static final int mist=0x7f020017;
public static final int mostly_sunny=0x7f020018;
public static final int sleet=0x7f020019;
public static final int smoke=0x7f02001a;
public static final int snow=0x7f02001b;
public static final int storm=0x7f02001c;
public static final int sunny=0x7f02001d;
public static final int task=0x7f02001e;
public static final int thunderstorm=0x7f02001f;
}
public static final class id {
public static final int ImageView01=0x7f07000d;
public static final int MnuOpc1=0x7f070030;
public static final int LinearLayout01=0x7f07002d;
public static final int LinearLayout02=0x7f07002e;
public static final int LinearLayout03=0x7f070031;
public static final int LinearLayout04=0x7f070034;
public static final int MnuOpc1=0x7f07003d;
public static final int MnuOpc2=0x7f07003e;
public static final int bonsaiImage=0x7f070002;
public static final int bonsairowtext=0x7f07001b;
public static final int btnCountry=0x7f07002a;
public static final int btnPostCode=0x7f070028;
public static final int btnSend=0x7f070038;
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 chkAttachment=0x7f070037;
public static final int contactbutton=0x7f07003b;
public static final int donatebutton=0x7f07003a;
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 etBody=0x7f070036;
public static final int etEmail=0x7f070030;
public static final int etSubject=0x7f070033;
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 imageView1=0x7f07003c;
public static final int imageView2=0x7f07000a;
public static final int imageView4=0x7f070010;
public static final int imageView5=0x7f070013;
Expand All @@ -91,28 +103,33 @@ public static final class id {
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 textView2=0x7f070039;
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 txtForBody=0x7f070035;
public static final int txtForEmail=0x7f07002f;
public static final int txtForSubject=0x7f070032;
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 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 int enviomail=0x7f030004;
public static final int gallery=0x7f030005;
public static final int main=0x7f030006;
public static final int more=0x7f030007;
public static final int selectbonsai=0x7f030008;
public static final int start=0x7f030009;
public static final int task=0x7f03000a;
public static final int task_row=0x7f03000b;
}
public static final class menu {
public static final int menu=0x7f060000;
public static final int menubonsai=0x7f060001;
}
public static final class string {
public static final int app_name=0x7f040000;
Expand Down
Binary file added res/drawable/disease.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
65 changes: 65 additions & 0 deletions res/layout/enviomail.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout android:id="@+id/LinearLayout01"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout android:id="@+id/LinearLayout02"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView android:text="To: "
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/txtForEmail"></TextView>

<TextView
android:id="@+id/etEmail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="mail Receiver" />

</LinearLayout>
<LinearLayout android:id="@+id/LinearLayout03"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView android:text="Subject"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/txtForSubject"></TextView>
<EditText android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:width="170dip"
android:id="@+id/etSubject">
</EditText>
</LinearLayout>
<LinearLayout android:id="@+id/LinearLayout04"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView android:text="Menssage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/txtForBody"></TextView>
<EditText android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lines="5"
android:width="300dip"
android:id="@+id/etBody">
</EditText>
</LinearLayout>
<CheckBox android:text="Send attachment aplication icon"
android:id="@+id/chkAttachment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"></CheckBox>
<Button android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/btnSend"
android:text="Send"
android:imeOptions="actionSend"
android:width="150dip">
</Button>
</LinearLayout>

2 changes: 1 addition & 1 deletion res/layout/more.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
android:textAppearance="?android:attr/textAppearanceSmall" />

<Button
android:id="@+id/donatebutton"
android:id="@+id/contactbutton"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
10 changes: 10 additions & 0 deletions res/menu/menubonsai.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?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>

<item android:id="@+id/MnuOpc2" android:title="Disease"
android:icon="@drawable/disease"></item>
</menu>
12 changes: 10 additions & 2 deletions src/bonsai/app/BonsaiActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ public void run() {

public void setTempInfo() {
try{
textWeather.setText(Integer.toString(w.getTempMedia())+"�C");
textWeather.setText(Integer.toString(w.getTempMedia())+"ºC");
} catch (Exception e) {

}
Expand Down Expand Up @@ -452,7 +452,7 @@ public void makeTransplant(View v) {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.menu, menu);
inflater.inflate(R.menu.menubonsai, menu);
return true;
}

Expand All @@ -462,6 +462,14 @@ public boolean onOptionsItemSelected(MenuItem item) {
case R.id.MnuOpc1:
Toast.makeText(this,"Display current information about the status of your bonsai", Toast.LENGTH_LONG).show();
return true;

case R.id.MnuOpc2:
Intent intent = new Intent(BonsaiActivity.this, EnvioMailActivity.class);
Bundle bundle = new Bundle();
bundle.putString("MAIL", "globereds@gmail.com");
intent.putExtras(bundle);
startActivity(intent);
return true;

default:
return super.onOptionsItemSelected(item);
Expand Down
58 changes: 58 additions & 0 deletions src/bonsai/app/EnvioMailActivity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
package bonsai.app;

import android.app.Activity;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.TextView;

public class EnvioMailActivity extends Activity {
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.enviomail);

final TextView etEmail = (TextView) findViewById(R.id.etEmail);
final EditText etSubject = (EditText) findViewById(R.id.etSubject);
final EditText etBody = (EditText) findViewById(R.id.etBody);
final CheckBox chkAttachment = (CheckBox) findViewById(R.id.chkAttachment);
Bundle bundle = getIntent().getExtras();
etEmail.setText(bundle.getString("MAIL"));

Button btnSend = (Button) findViewById(R.id.btnSend);
btnSend.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {

/* es necesario un intent que levante la actividad deseada */
Intent itSend = new Intent(android.content.Intent.ACTION_SEND);

/* vamos a enviar texto plano a menos que el checkbox esté marcado */
itSend.setType("plain/text");

/* colocamos los datos para el envio */
itSend.putExtra(android.content.Intent.EXTRA_EMAIL, new String[]{ etEmail.getText().toString()});
itSend.putExtra(android.content.Intent.EXTRA_SUBJECT, etSubject.getText().toString());
itSend.putExtra(android.content.Intent.EXTRA_TEXT, etBody.getText());

/* revisamos si el checkbox está marcado enviamos el icono de la aplicaci—n como adjunto */
if (chkAttachment.isChecked()) {
/* colocamos el adjunto en el stream */
itSend.putExtra(Intent.EXTRA_STREAM, Uri.parse("android.resource://" + getPackageName() + "/" + R.drawable.ic_launcher));

/* indicamos el tipo de dato */
itSend.setType("image/png");
}
/* iniciamos la actividad */
startActivity(itSend);
}
});
}
}

19 changes: 18 additions & 1 deletion src/bonsai/app/MoreActivity.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package bonsai.app;


import android.app.Activity;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.Toast;

public class MoreActivity extends Activity {
Expand All @@ -17,11 +20,25 @@ public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.more);

final Button btn = (Button)findViewById(R.id.contactbutton);

btn.setOnClickListener(new OnClickListener() {
public void onClick(View arg0) {
Intent intent = new Intent(MoreActivity.this, EnvioMailActivity.class);

Bundle bundle = new Bundle();
bundle.putString("MAIL", "raulmerlin@gmail.com ; rubevalero@gmail.com");
intent.putExtras(bundle);

startActivity(intent);
}
});


}

public void goDonate(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();
Uri uri = Uri.parse("http://www.merlitec.com");
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
Expand Down
4 changes: 2 additions & 2 deletions src/bonsai/app/TaskActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.MnuOpc1:
Toast.makeText(this,"Displays the daily care of your bonsai. Press Alarm ON / OFF to enable / disable notifications for the taskbar of your device", Toast.LENGTH_LONG).show();
Toast.makeText(this,"Displays the daily care of your bonsai.", Toast.LENGTH_LONG).show();
return true;
default:
return super.onOptionsItemSelected(item);
Expand All @@ -123,7 +123,7 @@ public boolean onOptionsItemSelected(MenuItem item) {

/*
* checkWater - Devuelve la accion a realizar respecto al riego de cierto bonsai, a partir
* de su ultimo riego, su frecuencia de regado y su tama�o.
* de su ultimo riego, su frecuencia de regado y su tama�o.
*
* @param id - fila de la base de datos del bonsai a comprobar
* @return String con la accion a realizar, o null si no hay que hacer nada.
Expand Down
Loading