[Android] Merged Schedule Meetings

OneCricketeer · Jan 23, 2014 · 0147943 · 0147943
1 parent 81b045f
commit 0147943
Show file tree

Hide file tree

Showing 93 changed files with 423 additions and 360 deletions.
diff --git a/DroidRage/AndroidManifest.xml b/DroidRage/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="edu.meetingninja.rhit"
+    package="com.meetingninja.csse"
     android:versionCode="1"
     android:versionName="1.0" >
 
@@ -27,13 +27,13 @@
         android:targetSdkVersion="19" />
 
     <application
-        android:name="edu.meetingninja.rhit.ApplicationController"
+        android:name="com.meetingninja.csse.ApplicationController"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name="edu.meetingninja.rhit.MainActivity"
+            android:name="com.meetingninja.csse.MainActivity"
             android:label="@string/app_name"
             android:windowSoftInputMode="adjustPan|adjustResize" >
             <intent-filter android:label="@string/app_name" >
@@ -43,69 +43,69 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="edu.meetingninja.rhit.user.LoginActivity"
+            android:name="com.meetingninja.csse.user.LoginActivity"
             android:label="@string/title_activity_login"
             android:noHistory="true"
             android:windowSoftInputMode="adjustResize|stateVisible" >
         </activity>
         <activity
-            android:name="edu.meetingninja.rhit.user.RegisterActivity"
+            android:name="com.meetingninja.csse.user.RegisterActivity"
             android:label="@string/title_activity_register"
             android:noHistory="true"
-            android:parentActivityName="edu.meetingninja.rhit.user.LoginActivity" >
+            android:parentActivityName="com.meetingninja.csse.user.LoginActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="edu.meetingninja.rhit.user.LoginActivity" />
+                android:value="com.meetingninja.csse.user.LoginActivity" />
         </activity>
         <activity
-            android:name="edu.meetingninja.rhit.meetings.EditMeetingActivity"
+            android:name="com.meetingninja.csse.meetings.EditMeetingActivity"
             android:label="@string/title_activity_meetings" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="edu.meetingninja.rhit.MainActivity" />
+                android:value="com.meetingninja.csse.MainActivity" />
         </activity>
         <activity
-            android:name="edu.meetingninja.rhit.tasks.CreateTasksActivity"
+            android:name="com.meetingninja.csse.tasks.CreateTasksActivity"
             android:label="@string/title_activity_tasks"
-            android:parentActivityName="edu.meetingninja.rhit.MainActivity" >
+            android:parentActivityName="com.meetingninja.csse.MainActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="edu.meetingninja.rhit.MainActivity" />
+                android:value="com.meetingninja.csse.MainActivity" />
         </activity>
         <activity
-            android:name="edu.meetingninja.rhit.notes.CreateNoteActivity"
+            android:name="com.meetingninja.csse.notes.CreateNoteActivity"
             android:label="@string/title_activity_edit_note" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="edu.meetingninja.rhit.MainActivity" />
+                android:value="com.meetingninja.csse.MainActivity" />
         </activity>
         <activity
-            android:name="edu.meetingninja.rhit.notes.EditNoteActivity"
+            android:name="com.meetingninja.csse.notes.EditNoteActivity"
             android:label="@string/title_activity_edit_note"
-            android:parentActivityName="edu.meetingninja.rhit.MainActivity" >
+            android:parentActivityName="com.meetingninja.csse.MainActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="edu.meetingninja.rhit.MainActivity" />
+                android:value="com.meetingninja.csse.MainActivity" />
         </activity>
         <activity
-            android:name="edu.meetingninja.rhit.notes.ViewNoteActivity"
+            android:name="com.meetingninja.csse.notes.ViewNoteActivity"
             android:label="@string/title_activity_view_note"
-            android:parentActivityName="edu.meetingninja.rhit.MainActivity" >
+            android:parentActivityName="com.meetingninja.csse.MainActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="edu.meetingninja.rhit.MainActivity" />
+                android:value="com.meetingninja.csse.MainActivity" />
         </activity>
         <activity
-            android:name="edu.meetingninja.rhit.notes.VersionControlActivity"
+            android:name="com.meetingninja.csse.notes.VersionControlActivity"
             android:label="@string/title_activity_version_control" >
         </activity>
         <activity
-            android:name="edu.meetingninja.rhit.meetings.ViewMeetingActivity"
+            android:name="com.meetingninja.csse.meetings.ViewMeetingActivity"
             android:label="@string/title_activity_view_meeting"
-            android:parentActivityName="edu.meetingninja.rhit.MainActivity" >
+            android:parentActivityName="com.meetingninja.csse.MainActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="edu.meetingninja.rhit.MainActivity" />
+                android:value="com.meetingninja.csse.MainActivity" />
         </activity>
 
         <service android:name="com.parse.PushService" />
@@ -118,22 +118,22 @@
         </receiver>
 
         <activity
-            android:name="edu.meetingninja.rhit.agenda.AgendaActivity"
+            android:name="com.meetingninja.csse.agenda.AgendaActivity"
             android:configChanges="keyboardHidden"
             android:label="@string/title_activity_agenda"
             android:screenOrientation="portrait" >
         </activity>
 
         <provider
-            android:name="edu.meetingninja.rhit.sync.provider.StubContentProvider"
-            android:authorities="edu.meetingninja.rhit.sync.provider"
+            android:name="com.meetingninja.csse.sync.provider.StubContentProvider"
+            android:authorities="com.meetingninja.csse.sync.provider"
             android:enabled="true"
             android:exported="false"
             android:syncable="true" >
         </provider>
 
         <service
-            android:name="edu.meetingninja.rhit.authenticator.NinjaAuthenticatorService"
+            android:name="com.meetingninja.csse.authenticator.NinjaAuthenticatorService"
             android:exported="true" >
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator" />
@@ -145,15 +145,15 @@
         </service>
 
         <activity
-            android:name="edu.meetingninja.rhit.user.ProfileActivity"
-            android:parentActivityName="edu.meetingninja.rhit.MainActivity" >
+            android:name="com.meetingninja.csse.user.ProfileActivity"
+            android:parentActivityName="com.meetingninja.csse.MainActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="edu.meetingninja.rhit.MainActivity" />
+                android:value="com.meetingninja.csse.MainActivity" />
         </activity>
-        <activity android:name="edu.meetingninja.rhit.tasks.ViewTaskActivity" >
+        <activity android:name="com.meetingninja.csse.tasks.ViewTaskActivity" >
         </activity>
-        <activity android:name="edu.meetingninja.rhit.tasks.EditTaskActivity" >
+        <activity android:name="com.meetingninja.csse.tasks.EditTaskActivity" >
         </activity>
     </application>
 

diff --git a/...nalSrc/com/doomonafireball/betterpickers/calendardatepicker/CalendarDatePickerDialog.java b/...nalSrc/com/doomonafireball/betterpickers/calendardatepicker/CalendarDatePickerDialog.java
@@ -43,8 +43,8 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import edu.meetingninja.rhit.R;
 import com.doomonafireball.betterpickers.Utils;
+import com.meetingninja.csse.R;
 import com.nineoldandroids.animation.ObjectAnimator;
 
 /**

diff --git a/...dRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/DayPickerView.java b/...dRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/DayPickerView.java
@@ -99,8 +99,8 @@ public DayPickerView(Context context,
 		mHandler = new Handler();
 		mController = controller;
 		mController.registerOnDateChangedListener(this);
-		setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT,
-				LayoutParams.MATCH_PARENT));
+		setLayoutParams(new LayoutParams(android.view.ViewGroup.LayoutParams.MATCH_PARENT,
+				android.view.ViewGroup.LayoutParams.MATCH_PARENT));
 		setDrawSelectorOnTop(false);
 		init(context);
 		onDateChanged();

diff --git a/.../externalSrc/com/doomonafireball/betterpickers/calendardatepicker/SimpleMonthAdapter.java b/.../externalSrc/com/doomonafireball/betterpickers/calendardatepicker/SimpleMonthAdapter.java
@@ -153,8 +153,8 @@ public View getView(int position, View convertView, ViewGroup parent) {
 		} else {
 			v = new SimpleMonthView(mContext);
 			// Set up the new view
-			LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT,
-					LayoutParams.MATCH_PARENT);
+			LayoutParams params = new LayoutParams(android.view.ViewGroup.LayoutParams.MATCH_PARENT,
+					android.view.ViewGroup.LayoutParams.MATCH_PARENT);
 			v.setLayoutParams(params);
 			v.setClickable(true);
 			v.setOnDayClickListener(this);

diff --git a/...age/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/SimpleMonthView.java b/...age/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/SimpleMonthView.java
@@ -42,10 +42,10 @@
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
 
-import edu.meetingninja.rhit.R;
 import com.doomonafireball.betterpickers.TouchExplorationHelper;
 import com.doomonafireball.betterpickers.Utils;
 import com.doomonafireball.betterpickers.calendardatepicker.SimpleMonthAdapter.CalendarDay;
+import com.meetingninja.csse.R;
 
 /**
  * A calendar-like view displaying a specified month and the appropriate

diff --git a/...c/com/doomonafireball/betterpickers/calendardatepicker/TextViewWithCircularIndicator.java b/...c/com/doomonafireball/betterpickers/calendardatepicker/TextViewWithCircularIndicator.java
@@ -25,7 +25,7 @@
 import android.util.AttributeSet;
 import android.widget.TextView;
 
-import edu.meetingninja.rhit.R;
+import com.meetingninja.csse.R;
 
 /**
  * A text view which, when pressed or activated, displays a blue circle around

diff --git a/...Rage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/YearPickerView.java b/...Rage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/YearPickerView.java
@@ -31,8 +31,8 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
-import edu.meetingninja.rhit.R;
 import com.doomonafireball.betterpickers.calendardatepicker.CalendarDatePickerDialog.OnDateChangedListener;
+import com.meetingninja.csse.R;
 
 /**
  * Displays a selectable list of years.
@@ -57,7 +57,7 @@ public YearPickerView(Context context,
 		mController = controller;
 		mController.registerOnDateChangedListener(this);
 		ViewGroup.LayoutParams frame = new ViewGroup.LayoutParams(
-				LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+				android.view.ViewGroup.LayoutParams.MATCH_PARENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT);
 		setLayoutParams(frame);
 		Resources res = context.getResources();
 		mViewSize = res

diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsPicker.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsPicker.java
@@ -15,7 +15,7 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import edu.meetingninja.rhit.R;
+import com.meetingninja.csse.R;
 
 public class HmsPicker extends LinearLayout implements Button.OnClickListener,
 		Button.OnLongClickListener {
@@ -388,10 +388,12 @@ public void writeToParcel(Parcel dest, int flags) {
 		}
 
 		public static final Creator<SavedState> CREATOR = new Creator<SavedState>() {
+			@Override
 			public SavedState createFromParcel(Parcel in) {
 				return new SavedState(in);
 			}
 
+			@Override
 			public SavedState[] newArray(int size) {
 				return new SavedState[size];
 			}

diff --git a/...Rage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsPickerDialogFragment.java b/...Rage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsPickerDialogFragment.java
@@ -13,7 +13,7 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 
-import edu.meetingninja.rhit.R;
+import com.meetingninja.csse.R;
 
 /**
  * Dialog to set alarm time.

diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsView.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsView.java
@@ -7,8 +7,8 @@
 import android.util.AttributeSet;
 import android.widget.LinearLayout;
 
-import edu.meetingninja.rhit.R;
 import com.doomonafireball.betterpickers.widget.ZeroTopPaddingTextView;
+import com.meetingninja.csse.R;
 
 public class HmsView extends LinearLayout {
 

diff --git a/...dRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/AmPmCirclesView.java b/...dRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/AmPmCirclesView.java
@@ -27,7 +27,7 @@
 import android.util.Log;
 import android.view.View;
 
-import edu.meetingninja.rhit.R;
+import com.meetingninja.csse.R;
 
 /**
  * Draw the two smaller AM and PM circles next to where the larger circle will

diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/CircleView.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/CircleView.java
@@ -23,7 +23,7 @@
 import android.util.Log;
 import android.view.View;
 
-import edu.meetingninja.rhit.R;
+import com.meetingninja.csse.R;
 
 /**
  * Draws a simple white circle on which the numbers will be drawn.

diff --git a/...ge/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialPickerLayout.java b/...ge/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialPickerLayout.java
@@ -39,7 +39,7 @@
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.FrameLayout;
 
-import edu.meetingninja.rhit.R;
+import com.meetingninja.csse.R;
 import com.nineoldandroids.animation.AnimatorSet;
 import com.nineoldandroids.animation.ObjectAnimator;
 import com.nineoldandroids.view.ViewHelper;
@@ -128,7 +128,7 @@ public RadialPickerLayout(Context context, AttributeSet attrs) {
 		preparePrefer30sMap();
 
 		mVibrator = (Vibrator) context
-				.getSystemService(Service.VIBRATOR_SERVICE);
+				.getSystemService(Context.VIBRATOR_SERVICE);
 		mLastVibrate = 0;
 		mLastValueSelected = -1;
 

diff --git a/...ge/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialSelectorView.java b/...ge/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialSelectorView.java
@@ -23,7 +23,7 @@
 import android.util.Log;
 import android.view.View;
 
-import edu.meetingninja.rhit.R;
+import com.meetingninja.csse.R;
 import com.nineoldandroids.animation.Keyframe;
 import com.nineoldandroids.animation.ObjectAnimator;
 import com.nineoldandroids.animation.PropertyValuesHolder;

diff --git a/...dRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialTextsView.java b/...dRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialTextsView.java
@@ -25,7 +25,7 @@
 import android.util.Log;
 import android.view.View;
 
-import edu.meetingninja.rhit.R;
+import com.meetingninja.csse.R;
 import com.nineoldandroids.animation.Keyframe;
 import com.nineoldandroids.animation.ObjectAnimator;
 import com.nineoldandroids.animation.PropertyValuesHolder;

diff --git a/...xternalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialTimePickerDialog.java b/...xternalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialTimePickerDialog.java
@@ -38,9 +38,9 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import edu.meetingninja.rhit.R;
 import com.doomonafireball.betterpickers.Utils;
 import com.doomonafireball.betterpickers.radialtimepicker.RadialPickerLayout.OnValueSelectedListener;
+import com.meetingninja.csse.R;
 import com.nineoldandroids.animation.ObjectAnimator;
 
 /**
@@ -263,7 +263,7 @@ public void onClick(View v) {
 			mAmPmTextView.setVisibility(View.GONE);
 
 			RelativeLayout.LayoutParams paramsSeparator = new RelativeLayout.LayoutParams(
-					LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+					android.view.ViewGroup.LayoutParams.WRAP_CONTENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT);
 			paramsSeparator.addRule(RelativeLayout.CENTER_IN_PARENT);
 			TextView separatorView = (TextView) view
 					.findViewById(R.id.separator);

diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/timepicker/TimePicker.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/timepicker/TimePicker.java
@@ -18,7 +18,7 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import edu.meetingninja.rhit.R;
+import com.meetingninja.csse.R;
 
 public class TimePicker extends LinearLayout implements Button.OnClickListener,
 		Button.OnLongClickListener {
@@ -764,10 +764,12 @@ public void writeToParcel(Parcel dest, int flags) {
 		}
 
 		public static final Parcelable.Creator<SavedState> CREATOR = new Parcelable.Creator<SavedState>() {
+			@Override
 			public SavedState createFromParcel(Parcel in) {
 				return new SavedState(in);
 			}
 
+			@Override
 			public SavedState[] newArray(int size) {
 				return new SavedState[size];
 			}

diff --git a/...ge/externalSrc/com/doomonafireball/betterpickers/timepicker/TimePickerDialogFragment.java b/...ge/externalSrc/com/doomonafireball/betterpickers/timepicker/TimePickerDialogFragment.java
@@ -13,7 +13,7 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 
-import edu.meetingninja.rhit.R;
+import com.meetingninja.csse.R;
 
 /**
  * Dialog to set alarm time.

diff --git a/DroidRage/externalSrc/com/doomonafireball/betterpickers/timepicker/TimerView.java b/DroidRage/externalSrc/com/doomonafireball/betterpickers/timepicker/TimerView.java
@@ -8,8 +8,8 @@
 import android.view.View;
 import android.widget.LinearLayout;
 
-import edu.meetingninja.rhit.R;
 import com.doomonafireball.betterpickers.widget.ZeroTopPaddingTextView;
+import com.meetingninja.csse.R;
 
 public class TimerView extends LinearLayout {
 

diff --git a/.../externalSrc/com/doomonafireball/betterpickers/widget/AutoScrollHorizontalScrollView.java b/.../externalSrc/com/doomonafireball/betterpickers/widget/AutoScrollHorizontalScrollView.java
@@ -22,6 +22,7 @@ public AutoScrollHorizontalScrollView(Context context, AttributeSet attrs,
 		super(context, attrs, defStyle);
 	}
 
+	@Override
 	protected void onLayout(boolean changed, int l, int t, int r, int b) {
 		super.onLayout(changed, l, t, r, b);
 		this.fullScroll(FOCUS_RIGHT);