diff --git a/bin/MyRoutine.apk b/bin/MyRoutine.apk index d7a4c4a..bb34ff8 100644 Binary files a/bin/MyRoutine.apk and b/bin/MyRoutine.apk differ diff --git a/bin/classes.dex b/bin/classes.dex index b8ea47e..7de4210 100644 Binary files a/bin/classes.dex and b/bin/classes.dex differ diff --git a/bin/classes/com/Rahat/myroutine/AddToListActivity$1.class b/bin/classes/com/Rahat/myroutine/AddToListActivity$1.class index 12cbede..c136723 100644 Binary files a/bin/classes/com/Rahat/myroutine/AddToListActivity$1.class and b/bin/classes/com/Rahat/myroutine/AddToListActivity$1.class differ diff --git a/bin/classes/com/Rahat/myroutine/AddToListActivity$2.class b/bin/classes/com/Rahat/myroutine/AddToListActivity$2.class index c41bcd4..0907177 100644 Binary files a/bin/classes/com/Rahat/myroutine/AddToListActivity$2.class and b/bin/classes/com/Rahat/myroutine/AddToListActivity$2.class differ diff --git a/bin/classes/com/Rahat/myroutine/AddToListActivity$3.class b/bin/classes/com/Rahat/myroutine/AddToListActivity$3.class index 6a5a0eb..4d7dcbd 100644 Binary files a/bin/classes/com/Rahat/myroutine/AddToListActivity$3.class and b/bin/classes/com/Rahat/myroutine/AddToListActivity$3.class differ diff --git a/bin/classes/com/Rahat/myroutine/AddToListActivity.class b/bin/classes/com/Rahat/myroutine/AddToListActivity.class index c3a05ea..af80ae7 100644 Binary files a/bin/classes/com/Rahat/myroutine/AddToListActivity.class and b/bin/classes/com/Rahat/myroutine/AddToListActivity.class differ diff --git a/bin/classes/com/Rahat/myroutine/ColorChooseActivity.class b/bin/classes/com/Rahat/myroutine/ColorChooseActivity.class index 66f8d09..2e3e79f 100644 Binary files a/bin/classes/com/Rahat/myroutine/ColorChooseActivity.class and b/bin/classes/com/Rahat/myroutine/ColorChooseActivity.class differ diff --git a/bin/classes/com/Rahat/myroutine/MainActivity.class b/bin/classes/com/Rahat/myroutine/MainActivity.class index 13dbc29..c910cb3 100644 Binary files a/bin/classes/com/Rahat/myroutine/MainActivity.class and b/bin/classes/com/Rahat/myroutine/MainActivity.class differ diff --git a/bin/classes/com/Rahat/myroutine/R$id.class b/bin/classes/com/Rahat/myroutine/R$id.class index 0cf2b73..01d37c4 100644 Binary files a/bin/classes/com/Rahat/myroutine/R$id.class and b/bin/classes/com/Rahat/myroutine/R$id.class differ diff --git a/bin/classes/com/Rahat/myroutine/R$layout.class b/bin/classes/com/Rahat/myroutine/R$layout.class index a0f9c9d..5c66fe9 100644 Binary files a/bin/classes/com/Rahat/myroutine/R$layout.class and b/bin/classes/com/Rahat/myroutine/R$layout.class differ diff --git a/bin/classes/com/Rahat/myroutine/R$menu.class b/bin/classes/com/Rahat/myroutine/R$menu.class index 028811e..e4c0474 100644 Binary files a/bin/classes/com/Rahat/myroutine/R$menu.class and b/bin/classes/com/Rahat/myroutine/R$menu.class differ diff --git a/bin/classes/com/Rahat/myroutine/R$string.class b/bin/classes/com/Rahat/myroutine/R$string.class index cf64086..7e3f144 100644 Binary files a/bin/classes/com/Rahat/myroutine/R$string.class and b/bin/classes/com/Rahat/myroutine/R$string.class differ diff --git a/bin/classes/com/Rahat/myroutine/R$style.class b/bin/classes/com/Rahat/myroutine/R$style.class index 0b8cf2e..abf234e 100644 Binary files a/bin/classes/com/Rahat/myroutine/R$style.class and b/bin/classes/com/Rahat/myroutine/R$style.class differ diff --git a/bin/resources.ap_ b/bin/resources.ap_ index 729c055..e6d4160 100644 Binary files a/bin/resources.ap_ and b/bin/resources.ap_ differ diff --git a/gen/com/Rahat/myroutine/R.java b/gen/com/Rahat/myroutine/R.java index a0aee6b..d32805e 100644 --- a/gen/com/Rahat/myroutine/R.java +++ b/gen/com/Rahat/myroutine/R.java @@ -58,15 +58,16 @@ public static final class drawable { public static final class id { public static final int LinearLayout1=0x7f0b0000; public static final int LinearLayout2=0x7f0b0012; - public static final int action_about=0x7f0b002b; - public static final int action_chooseCustomColor=0x7f0b0025; - public static final int action_clearData=0x7f0b0028; - public static final int action_copy=0x7f0b0026; - public static final int action_exit=0x7f0b002c; - public static final int action_exportData=0x7f0b0029; - public static final int action_importData=0x7f0b002a; + public static final int action_about=0x7f0b002c; + public static final int action_chooseCustomColor=0x7f0b0026; + public static final int action_clearData=0x7f0b0029; + public static final int action_copy=0x7f0b0027; + public static final int action_exit=0x7f0b002d; + public static final int action_exportData=0x7f0b002a; + public static final int action_importData=0x7f0b002b; + public static final int action_saveItem=0x7f0b0025; public static final int action_settings=0x7f0b0024; - public static final int action_stopPaste=0x7f0b0027; + public static final int action_stopPaste=0x7f0b0028; public static final int buttonChoose=0x7f0b000e; public static final int buttonClear=0x7f0b0010; public static final int buttonSave=0x7f0b0005; @@ -136,24 +137,25 @@ public static final class string { public static final int action_exit=0x7f07000a; public static final int action_exportData=0x7f070006; public static final int action_importData=0x7f070007; + public static final int action_saveItem=0x7f07000b; public static final int action_settings=0x7f070005; public static final int action_stopPaste=0x7f070003; public static final int app_name=0x7f070000; - public static final int buttonText_customColor=0x7f07000f; - public static final int centeringX_title=0x7f070014; - public static final int centeringY_title=0x7f070015; - public static final int fileNameHint=0x7f070018; - public static final int fileNamePickerTitle=0x7f070017; + public static final int buttonText_customColor=0x7f070010; + public static final int centeringX_title=0x7f070015; + public static final int centeringY_title=0x7f070016; + public static final int fileNameHint=0x7f070019; + public static final int fileNamePickerTitle=0x7f070018; public static final int hello_world=0x7f070001; - public static final int textLineGap_title=0x7f070016; - public static final int text_dataModified=0x7f07000b; - public static final int text_size_title=0x7f070013; - public static final int title_activity_about=0x7f070012; - public static final int title_activity_add_to_list=0x7f07000d; - public static final int title_activity_color_choose=0x7f07000e; - public static final int title_activity_custom_color_chooser=0x7f070010; - public static final int title_activity_settings=0x7f070011; - public static final int title_dialog_file_chooser=0x7f07000c; + public static final int textLineGap_title=0x7f070017; + public static final int text_dataModified=0x7f07000c; + public static final int text_size_title=0x7f070014; + public static final int title_activity_about=0x7f070013; + public static final int title_activity_add_to_list=0x7f07000e; + public static final int title_activity_color_choose=0x7f07000f; + public static final int title_activity_custom_color_chooser=0x7f070011; + public static final int title_activity_settings=0x7f070012; + public static final int title_dialog_file_chooser=0x7f07000d; } public static final class style { /** diff --git a/res/menu/add_to_list.xml b/res/menu/add_to_list.xml index c767e4d..5aba94f 100644 --- a/res/menu/add_to_list.xml +++ b/res/menu/add_to_list.xml @@ -1,5 +1,11 @@ + + diff --git a/res/menu/color_choose.xml b/res/menu/color_choose.xml index ee83c05..85c67fa 100644 --- a/res/menu/color_choose.xml +++ b/res/menu/color_choose.xml @@ -5,7 +5,7 @@ diff --git a/res/values/strings.xml b/res/values/strings.xml index a9e9aa8..38f7b7c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12,9 +12,10 @@ Custom Color About Exit + Save Some data have been changed. Do you want to save? Choose File - Edit + Edit Subject Choose Color Custom Color Choose Custom Color diff --git a/src/com/Rahat/myroutine/AddToListActivity.java b/src/com/Rahat/myroutine/AddToListActivity.java index c74c427..f8e3055 100644 --- a/src/com/Rahat/myroutine/AddToListActivity.java +++ b/src/com/Rahat/myroutine/AddToListActivity.java @@ -11,6 +11,7 @@ import android.view.WindowManager; import android.widget.Button; import android.widget.EditText; +import android.widget.Toast; public class AddToListActivity extends Activity { @@ -21,6 +22,7 @@ public class AddToListActivity extends Activity { String itemColorName; Intent intent; + int day,period; int buttonColorConstant; @@ -29,11 +31,6 @@ public class AddToListActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - //Full Screen - requestWindowFeature(Window.FEATURE_NO_TITLE); - getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, - WindowManager.LayoutParams.FLAG_FULLSCREEN); - //------------*/ setContentView(R.layout.activity_add_to_list); intent=getIntent(); @@ -50,8 +47,8 @@ private void initialize() { etCourseName=(EditText) findViewById(R.id.editTextCourseName); etTeachers=(EditText) findViewById(R.id.editTextTeachers); - final int day=intent.getIntExtra("day",0); - final int period=intent.getIntExtra("period", 0); + day=intent.getIntExtra("day",0); + period=intent.getIntExtra("period", 0); saveButton.setText("Save ("+ MainActivity.days[day-1]+","+MainActivity.times[period-1]+")"); @@ -60,24 +57,20 @@ private void initialize() { buttonColorConstant=item.getColorConstant(); colorChooseButton.setBackgroundColor(buttonColorConstant); + etCourseId.setText(item.getCourseID()); etCourseName.setText(item.getCourseName()); etTeachers.setText(item.getTeachers()); + //sending cursor to end + etCourseId.setSelection(item.getCourseID().length()); + saveButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - item.setCourseID(etCourseId.getText().toString()); - item.setCourseName(etCourseName.getText().toString()); - item.setTeachers(etTeachers.getText().toString()); - item.setColorConstant(buttonColorConstant); - - MainActivity.items[day][period]=item; - MainActivity.dataNeedToBeSaved=true; - - finish(); + saveItem(); } }); @@ -93,7 +86,7 @@ public void onClick(View v) { etCourseName.setText(item.getCourseName()); etTeachers.setText(item.getTeachers()); - //Toast.makeText(getBaseContext(), "Cleared", Toast.LENGTH_SHORT).show(); + Toast.makeText(getBaseContext(), "Cleared", Toast.LENGTH_SHORT).show(); } }); @@ -127,13 +120,28 @@ public boolean onCreateOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - /*// Handle action bar item clicks here. The action bar will + // Handle action bar item clicks here. The action bar will // automatically handle clicks on the Home/Up button, so long // as you specify a parent activity in AndroidManifest.xml. int id = item.getItemId(); - if (id == R.id.action_settings) { + if (id == R.id.action_saveItem) { + saveItem(); return true; - }*/ + } return super.onOptionsItemSelected(item); } + + + private void saveItem() { + item.setCourseID(etCourseId.getText().toString()); + item.setCourseName(etCourseName.getText().toString()); + item.setTeachers(etTeachers.getText().toString()); + item.setColorConstant(buttonColorConstant); + + MainActivity.items[day][period]=item; + MainActivity.dataNeedToBeSaved=true; + + //Toast.makeText(getBaseContext(), "Saved", Toast.LENGTH_SHORT).show(); + finish(); + } }