diff --git a/app/build.gradle b/app/build.gradle
index 20801373a986ae46db5db0869a4b633b4187402d..31092422b5433e97fca68669d91ab3ac8f77bc9e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,6 +28,7 @@ dependencies {
compile 'com.google.firebase:firebase-auth:10.2.1'
compile 'com.google.firebase:firebase-database:10.2.1'
compile 'com.google.android.gms:play-services-auth:10.2.1'
+ compile 'com.android.support:support-v4:25.3.1'
testCompile 'junit:junit:4.12'
}
diff --git a/app/src/main/java/com/darshanbshah/odsystem/HoursFragment.java b/app/src/main/java/com/darshanbshah/odsystem/HoursFragment.java
new file mode 100644
index 0000000000000000000000000000000000000000..d4a5c4256859373b1add102854ed85f1f08f9b4b
--- /dev/null
+++ b/app/src/main/java/com/darshanbshah/odsystem/HoursFragment.java
@@ -0,0 +1,23 @@
+package com.darshanbshah.odsystem;
+
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+
+public class HoursFragment extends Fragment {
+
+
+ public HoursFragment() {
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ return inflater.inflate(R.layout.fragment_hours, container, false);
+ }
+
+}
diff --git a/app/src/main/java/com/darshanbshah/odsystem/MainActivity.java b/app/src/main/java/com/darshanbshah/odsystem/MainActivity.java
index dc831b9479482c1d190dd779beb30a8afe5f06ef..e6620318e0ac7993c1be01f0bc4ca417c8c74312 100644
--- a/app/src/main/java/com/darshanbshah/odsystem/MainActivity.java
+++ b/app/src/main/java/com/darshanbshah/odsystem/MainActivity.java
@@ -6,6 +6,7 @@ import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.DatePicker;
+import android.widget.FrameLayout;
import android.widget.TextView;
import com.google.firebase.auth.FirebaseAuth;
@@ -18,6 +19,7 @@ public class MainActivity extends AppCompatActivity {
private TextView welcomeText;
Calendar calendar = Calendar.getInstance();
TextView from, to;
+ FrameLayout frameLayout;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -27,6 +29,7 @@ public class MainActivity extends AppCompatActivity {
welcomeText.setText("Welcome " + mAuth.getCurrentUser().getEmail());
from = (TextView)findViewById(R.id.fromDateTV);
to = (TextView)findViewById(R.id.toDateTV);
+ frameLayout = (FrameLayout) findViewById(R.id.hours_frame_layout);
}
public void onClickFromDatePicker(View view) {
@@ -51,6 +54,22 @@ public class MainActivity extends AppCompatActivity {
}
};
+ public void onFullDayClick(View view) {
+ if(frameLayout != null) {
+ frameLayout.setVisibility(View.INVISIBLE);
+ }
+
+ }
+
+ public void onHoursClick(View view) {
+ android.support.v4.app.FragmentManager manager = getSupportFragmentManager();
+ android.support.v4.app.FragmentTransaction transaction = manager.beginTransaction();
+ HoursFragment hoursFragment = new HoursFragment();
+ frameLayout.setVisibility(View.VISIBLE);
+ transaction.add(R.id.hours_frame_layout, hoursFragment);
+ transaction.commit();
+ }
+
public void signOut(View view) {
mAuth.signOut();
startActivity(new Intent(this, Login.class));
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 41107df3f48bf2bf54a57a08370fe11a456af1a8..be12dd5cc237c029510941c1c03b1ce5952848da 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -123,16 +123,26 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/fullDayRadioButton"
- android:layout_weight="1" />
+ android:layout_weight="1"
+ android:onClick="onFullDayClick" />
<RadioButton
android:text="A few hours"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/hoursRadioButton"
- android:layout_weight="1" />
+ android:layout_weight="1"
+ android:onClick="onHoursClick" />
</RadioGroup>
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/hours_frame_layout"
+ android:layout_marginTop="@dimen/activity_vertical_margin">
+
+ </FrameLayout>
+
<Button
android:text="Request OD"
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_hours.xml b/app/src/main/res/layout/fragment_hours.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6471c7a6184befc47c878ce6af2f239ed3f2ae6d
--- /dev/null
+++ b/app/src/main/res/layout/fragment_hours.xml
@@ -0,0 +1,56 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context="com.darshanbshah.odsystem.HoursFragment"
+ android:id="@+id/frame_layout">
+
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <CheckBox
+ android:text="1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/hour1"
+ android:layout_weight="1" />
+
+ <CheckBox
+ android:text="2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/hour2"
+ android:layout_weight="1" />
+
+ <CheckBox
+ android:text="3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/hour3"
+ android:layout_weight="1" />
+
+ <CheckBox
+ android:text="4"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/hour4"
+ android:layout_weight="1" />
+
+ <CheckBox
+ android:text="5"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/hour5"
+ android:layout_weight="1" />
+
+ <CheckBox
+ android:text="6"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/hour6"
+ android:layout_weight="1" />
+ </LinearLayout>
+</FrameLayout>