From 306c1a65e1b352740d0c55ded51902735c2f78cc Mon Sep 17 00:00:00 2001
From: Marius Gavrilescu <marius@ieval.ro>
Date: Wed, 12 Jun 2013 19:39:56 +0300
Subject: [PATCH] Finish second-to-last commit

---
 src/ro/ieval/unical/AddEventActivity.java | 24 -----------------------
 src/ro/ieval/unical/TrivialFragment.java  | 23 ++++++++++++++++++++--
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/ro/ieval/unical/AddEventActivity.java b/src/ro/ieval/unical/AddEventActivity.java
index 606685f..59ddd5b 100644
--- a/src/ro/ieval/unical/AddEventActivity.java
+++ b/src/ro/ieval/unical/AddEventActivity.java
@@ -6,18 +6,13 @@ import android.app.ActionBar;
 import android.app.Activity;
 import android.app.DatePickerDialog.OnDateSetListener;
 import android.app.Fragment;
-import android.app.FragmentManager;
 import android.app.TimePickerDialog.OnTimeSetListener;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.DatePicker;
-import android.widget.Spinner;
-import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.TimePicker;
 
@@ -57,25 +52,6 @@ public final class AddEventActivity extends Activity implements OnDateSetListene
 		actionBar.addTab(t1);
 		actionBar.addTab(t2);
 		actionBar.addTab(t3);
-
-		handleViews(f1,f2,f3);
-
-	}
-
-	private void handleViews(Fragment f1,Fragment f2,Fragment f3) {
-		Switch repeatSwitch = (Switch) this.getFragmentManager().findFragmentById(f1.getId()).getView().findViewById(R.id.repeat_switch);
-		final Spinner repeatSpinner = (Spinner) this.getFragmentManager().findFragmentById(f1.getId()).getView().findViewById(R.id.repeat_spinner);
-		repeatSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
-
-			@Override
-			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-				if(isChecked) {
-					repeatSpinner.setEnabled(true);
-				}else {
-					repeatSpinner.setEnabled(false);
-				}
-			}
-		});
 	}
 
 	@Override
diff --git a/src/ro/ieval/unical/TrivialFragment.java b/src/ro/ieval/unical/TrivialFragment.java
index 4c474e6..0932a4a 100644
--- a/src/ro/ieval/unical/TrivialFragment.java
+++ b/src/ro/ieval/unical/TrivialFragment.java
@@ -5,12 +5,31 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.Spinner;
+import android.widget.Switch;
+import android.widget.CompoundButton.OnCheckedChangeListener;
 
 public final class TrivialFragment extends Fragment {
 	public static final String ARGUMENT_LAYOUT="layout";
 
 	@Override
     public View onCreateView(final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) {
-        return inflater.inflate(getArguments().getInt(ARGUMENT_LAYOUT), container, false);
-    }
+		final View view=inflater.inflate(getArguments().getInt(ARGUMENT_LAYOUT), container, false);
+		final Switch repeatSwitch = (Switch) view.findViewById(R.id.repeat_switch);
+		if(repeatSwitch != null){
+			final Spinner repeatSpinner = (Spinner) view.findViewById(R.id.repeat_spinner);
+			repeatSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+				@Override
+				public void onCheckedChanged(final CompoundButton buttonView, final boolean isChecked) {
+					if(isChecked) {
+						repeatSpinner.setEnabled(true);
+					}else {
+						repeatSpinner.setEnabled(false);
+					}
+				}
+			});
+		}
+		return view;
+	}
 }
-- 
2.39.2