diff --git a/app/src/main/java/com/darshanbshah/odsystem/Login.java b/app/src/main/java/com/darshanbshah/odsystem/Login.java
index f25dc99fb47d0a88fb3ba09b813ffbdaf8ffa4fd..a46ecd5259eb4199bc8dc6e1cbf3171892b8b7cd 100644
--- a/app/src/main/java/com/darshanbshah/odsystem/Login.java
+++ b/app/src/main/java/com/darshanbshah/odsystem/Login.java
@@ -58,9 +58,7 @@ public class Login extends AppCompatActivity implements GoogleApiClient.OnConnec
};
GoogleSignInOptions options = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN).requestIdToken(getString(R.string.default_web_client_id)).requestEmail().build();
mGoogleApiClient = new GoogleApiClient.Builder(this).enableAutoManage(this, this).addApi(Auth.GOOGLE_SIGN_IN_API, options).build();
-
findViewById(R.id.sign_in_button).setOnClickListener(this);
-
dialog = new ProgressDialog(this);
}
diff --git a/app/src/main/java/com/darshanbshah/odsystem/MainActivity.java b/app/src/main/java/com/darshanbshah/odsystem/MainActivity.java
index 2b1db6092ffd9875ef032a79fa18007c95f8b1a1..dc831b9479482c1d190dd779beb30a8afe5f06ef 100644
--- a/app/src/main/java/com/darshanbshah/odsystem/MainActivity.java
+++ b/app/src/main/java/com/darshanbshah/odsystem/MainActivity.java
@@ -1,17 +1,23 @@
package com.darshanbshah.odsystem;
+import android.app.DatePickerDialog;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
+import android.widget.DatePicker;
import android.widget.TextView;
import com.google.firebase.auth.FirebaseAuth;
+import java.util.Calendar;
+
public class MainActivity extends AppCompatActivity {
private FirebaseAuth mAuth;
private TextView welcomeText;
+ Calendar calendar = Calendar.getInstance();
+ TextView from, to;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -19,8 +25,32 @@ public class MainActivity extends AppCompatActivity {
mAuth = FirebaseAuth.getInstance();
welcomeText = (TextView)findViewById(R.id.welcomeText);
welcomeText.setText("Welcome " + mAuth.getCurrentUser().getEmail());
+ from = (TextView)findViewById(R.id.fromDateTV);
+ to = (TextView)findViewById(R.id.toDateTV);
+ }
+
+ public void onClickFromDatePicker(View view) {
+ new DatePickerDialog(this, fromListener, calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH)).show();
}
+ DatePickerDialog.OnDateSetListener fromListener = new DatePickerDialog.OnDateSetListener() {
+ @Override
+ public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) {
+ from.setText(dayOfMonth + "/" + (month + 1) + "/" + year);
+ }
+ };
+
+ public void onClickToDatePicker(View view) {
+ new DatePickerDialog(this, toListener, calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH)).show();
+ }
+
+ DatePickerDialog.OnDateSetListener toListener = new DatePickerDialog.OnDateSetListener() {
+ @Override
+ public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) {
+ to.setText(dayOfMonth + "/" + (month + 1) + "/" + year);
+ }
+ };
+
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 5240c74580e31f99def20df4c883be04ecf17d49..41107df3f48bf2bf54a57a08370fe11a456af1a8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -20,9 +20,128 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@+id/sign_out_button"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="66dp"
android:id="@+id/welcomeText"
- android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
+ android:textAppearance="@style/TextAppearance.AppCompat.Display1"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentStart="true"
+ android:textSize="12sp"
+ android:textAlignment="center" />
+
+ <TextView
+ android:text="Apply OD"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_marginTop="14dp"
+ android:layout_marginLeft="@dimen/activity_horizontal_margin"
+ android:id="@+id/textView2"
+ android:textSize="30sp"
+ android:textAllCaps="false" />
+
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="@dimen/activity_horizontal_margin"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_below="@+id/sign_out_button"
+ android:layout_centerHorizontal="true">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="textPersonName"
+ android:ems="10"
+ android:id="@+id/reasonEditText"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentStart="true"
+ android:layout_marginTop="@dimen/activity_vertical_margin"
+ android:hint="Reason"
+ android:textAlignment="center" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="horizontal"
+ android:layout_marginTop="@dimen/activity_vertical_margin"
+ android:id="@+id/fromLinearLayout">
+
+ <Button
+ android:text="From"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/fromDate"
+ android:fontFamily="sans-serif-medium"
+ style="@style/Widget.AppCompat.Button.Colored"
+ android:onClick="onClickFromDatePicker" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/fromDateTV"
+ android:layout_weight="1"
+ android:layout_marginLeft="@dimen/activity_horizontal_margin"/>
+
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="horizontal"
+ android:id="@+id/toLinearLayout">
+ <Button
+ android:text="To"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/toDate"
+ android:onClick="onClickToDatePicker" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/toDateTV"
+ android:layout_weight="1"
+ android:layout_marginLeft="@dimen/activity_horizontal_margin"/>
+
+ </LinearLayout>
+
+ <RadioGroup
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="horizontal"
+ android:layout_marginTop="@dimen/activity_vertical_margin">
+
+
+ <RadioButton
+ android:text="Full Day"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/fullDayRadioButton"
+ android:layout_weight="1" />
+
+ <RadioButton
+ android:text="A few hours"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/hoursRadioButton"
+ android:layout_weight="1" />
+ </RadioGroup>
+
+ <Button
+ android:text="Request OD"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/requestButton"
+ android:layout_marginTop="@dimen/activity_vertical_margin"/>
+
+ </LinearLayout>
+
+ </ScrollView>
+
</RelativeLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 47c82246738c4d056e8030d3a259206f42e8e15d..eb0b0a3d5e02888f2480f4f1ce608c4d45315a6c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,5 +1,5 @@
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
- <dimen name="activity_horizontal_margin">16dp</dimen>
- <dimen name="activity_vertical_margin">16dp</dimen>
+ <dimen name="activity_horizontal_margin">32dp</dimen>
+ <dimen name="activity_vertical_margin">32dp</dimen>
</resources>