Merge branch 'master' of ssh://ieval.ro/srv/git/unical

diff --git a/res/layout/add_event_basic_tab.xml b/res/layout/add_event_basic_tab.xml
index 00d07c2918e9e61148f24f9594f61d4f0100f0ea..05b98ab1e4ca4c39dcddc9f2e456af589db3c5b6 100644 (file)
--- a/res/layout/add_event_basic_tab.xml
+++ b/res/layout/add_event_basic_tab.xml
@@ -123,12 +123,9 @@
        
                <EditText
                    android:id="@+id/repeat_time"
-                   android:layout_width="0dip"
-                   android:layout_height="wrap_content"
-                   android:layout_weight="1"
-                   android:ems="4"
-                   android:text="1"
-                   android:inputType="number" />
+                   android:inputType="number"
+                   android:layout_width="wrap_content"
+                   android:layout_height="wrap_content" />
        
                <Spinner
                        android:id="@+id/repeat_spinner"
@@ -156,9 +153,15 @@
                    android:inputType="number"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                   android:visibility="gone"
-               />
-       
+                   android:visibility="gone" />
+               <TextView
+               style="@android:style/Widget.DeviceDefault.EditText"
+                   android:id="@+id/repeat_until"
+                   android:layout_width="wrap_content"
+                   android:layout_height="wrap_content"
+               android:onClick="showDateTimePickerDialog"
+                   android:ems="8"
+                   android:visibility="gone" />
            </LinearLayout>
        </LinearLayout>
 </LinearLayout>

diff --git a/src/ro/ieval/unical/AddEventActivity.java b/src/ro/ieval/unical/AddEventActivity.java
index 9219640ce93b53bdc79351012aa605e3eb15cc25..62afe13b269b6c11e3c63550394402f7d1433d44 100644 (file)
--- a/src/ro/ieval/unical/AddEventActivity.java
+++ b/src/ro/ieval/unical/AddEventActivity.java
@@ -74,7 +74,7 @@ public final class AddEventActivity extends Activity implements OnDateSetListene
 
        public void showDateTimePickerDialog(final View v) {
                dateTimeTextView=(TextView) v;
-               if(v.getId()==R.id.date_start || v.getId()==R.id.date_end)
+               if(v.getId()==R.id.date_start || v.getId()==R.id.date_end || v.getId() == R.id.repeat_until)
                        new DatePickerFragment().show(getFragmentManager(), "datePicker");
                else
                        new TimePickerFragment().show(getFragmentManager(), "timePicker");

diff --git a/src/ro/ieval/unical/DeleteEventDialog.java b/src/ro/ieval/unical/DeleteEventDialog.java
index ba2f9c4600f07948c5ba6885b6ead96a6adbb5d5..56e71cbdd97bf77cf820ff1a9c95058a8b1d83af 100644 (file)
--- a/src/ro/ieval/unical/DeleteEventDialog.java
+++ b/src/ro/ieval/unical/DeleteEventDialog.java
@@ -10,8 +10,15 @@ import android.os.Bundle;
 
 @SuppressLint("ValidFragment")
 public final class DeleteEventDialog extends DialogFragment {
-       Event e; Activity a;
-       
+       private final Event event;
+       private final Activity activity;
+
+       public DeleteEventDialog(final Event event, final Activity activity) {
+               super();
+               this.event=event;
+               this.activity=activity;
+       }
+
        @Override
        public Dialog onCreateDialog(final Bundle savedInstanceState) {
                final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
@@ -19,9 +26,8 @@ public final class DeleteEventDialog extends DialogFragment {
                           .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
                                   @Override
                                   public void onClick(final DialogInterface dialog, final int id) {
-                                          // Nothing happens here yet
-                                          e.delete(getActivity());
-                                          a.finish();
+                                          event.delete(getActivity());
+                                          activity.finish();
                                   }
                           })
                           .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
@@ -32,8 +38,4 @@ public final class DeleteEventDialog extends DialogFragment {
                           });
                return builder.create();
        }
-       public DeleteEventDialog(Event e,Activity a) {
-               this.e=e;
-               this.a=a;
-       }
 }

diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index f5bb14653686068d3f47ec33b3c7439c2ed60a79..bb819b9eb51558facca7f6844b3da8c5fd48b4fe 100644 (file)
--- a/src/ro/ieval/unical/DisplayEventActivity.java
+++ b/src/ro/ieval/unical/DisplayEventActivity.java
@@ -15,7 +15,7 @@ import android.widget.TextView;
 
 public class DisplayEventActivity extends Activity {
        public static final String EXTRA_EVENT = "event";
-       Event e;
+       private Event event;
 
        public static void displayEvent(final Context context, final Event event){
                final Intent i=new Intent(context,DisplayEventActivity.class);
@@ -26,9 +26,9 @@ public class DisplayEventActivity extends Activity {
        @Override
        protected void onCreate(final Bundle savedInstanceState) {
                super.onCreate(savedInstanceState);
-               e=getIntent().getParcelableExtra(EXTRA_EVENT);
+               event=getIntent().getParcelableExtra(EXTRA_EVENT);
                setContentView(R.layout.event_view);
-               setTitle(e.title);
+               setTitle(event.title);
 
                final TextView startDay= (TextView) findViewById(R.id.startday);
                final TextView endDay= (TextView) findViewById(R.id.endday);
@@ -38,8 +38,8 @@ public class DisplayEventActivity extends Activity {
                final TextView endTime= (TextView) findViewById(R.id.endtime);
                final TextView description= (TextView) findViewById(R.id.event_view_description);
 
-               final Date start=new Date(e.dtstart);
-               final Date end=new Date(e.dtend);
+               final Date start=new Date(event.dtstart);
+               final Date end=new Date(event.dtend);
                final SimpleDateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy", Locale.UK);
                final SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss", Locale.UK);
                final SimpleDateFormat dayOfWeekFormat = new SimpleDateFormat("EEEEEEE", Locale.UK);
@@ -52,7 +52,7 @@ public class DisplayEventActivity extends Activity {
                startDate.setText(dateFormat.format(start));
                startTime.setText(timeFormat.format(start));
                endTime.setText(timeFormat.format(end));
-               description.setText(e.description);
+               description.setText(event.description);
        }
 
        @Override
@@ -71,7 +71,7 @@ public class DisplayEventActivity extends Activity {
                                startActivity(i);
                                return true;
                        case R.id.deleteevent:
-                               final DeleteEventDialog d=new DeleteEventDialog(e,this);
+                               final DeleteEventDialog d=new DeleteEventDialog(event,this);
                                d.show(getFragmentManager(), "Delete");
                                return true;
                        case R.id.eventlist:

diff --git a/src/ro/ieval/unical/TrivialFragment.java b/src/ro/ieval/unical/TrivialFragment.java
index 23086ab0a43d3e45680f072dd885c8115c0d282e..9486f831b042619702e0f1a0c9fa37b0aa364130 100644 (file)
--- a/src/ro/ieval/unical/TrivialFragment.java
+++ b/src/ro/ieval/unical/TrivialFragment.java
@@ -13,9 +13,12 @@ import android.widget.Switch;
 
 public final class TrivialFragment extends Fragment {
        private static class OnItemSelectedListener implements android.widget.AdapterView.OnItemSelectedListener{
-               final View repeatCount;
-               public OnItemSelectedListener(final View repeatCount) {
+               private final View repeatCount;
+               private final View repeatUntil;
+
+               public OnItemSelectedListener(final View repeatCount, final View repeatUntil) {
                        this.repeatCount=repeatCount;
+                       this.repeatUntil=repeatUntil;
                }
 
                @Override
@@ -23,12 +26,15 @@ public final class TrivialFragment extends Fragment {
                        switch(pos){
                        case 0:
                                repeatCount.setVisibility(View.GONE);
+                               repeatUntil.setVisibility(View.GONE);
                                break;
                        case 1:
                                repeatCount.setVisibility(View.GONE);
+                               repeatUntil.setVisibility(View.VISIBLE);
                                break;
                        case 2:
                                repeatCount.setVisibility(View.VISIBLE);
+                               repeatUntil.setVisibility(View.GONE);
                                break;
                        default:
                        }
@@ -50,7 +56,7 @@ public final class TrivialFragment extends Fragment {
                        if(isChecked) {
                                Utils.setEnabledRecursively(layout, true);
                                final Spinner repeatType = (Spinner) root.findViewById(R.id.repeat_type);
-                               repeatType.setOnItemSelectedListener(new OnItemSelectedListener(root.findViewById(R.id.repeat_count)));
+                               repeatType.setOnItemSelectedListener(new OnItemSelectedListener(root.findViewById(R.id.repeat_count),root.findViewById(R.id.repeat_until)));
                        }else {
                                Utils.setEnabledRecursively(layout, false);
                        }