Revert "Remove login files"

This reverts commit 47235439

app/build.gradle

@@ -34,10 +34,6 @@ dependencies {
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'com.google.android.gms:play-services-maps:17.0.1'
-    implementation 'androidx.drawerlayout:drawerlayout:1.1.1'
-    implementation 'androidx.annotation:annotation:1.2.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

app/src/main/AndroidManifest.xml

@@ -15,21 +15,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.SmartServiceAssistant">
-        <activity android:name=".Login">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".ui.login.Login"
-            android:label="@string/title_activity_login" />
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/title_activity_main"
-            android:theme="@style/Theme.SmartServiceAssistant.NoActionBar" />
-        <activity android:name=".spareparts.SuggestYoutubeVideos" />
+        <activity android:name=".spareparts.SuggestYoutubeVideos"></activity>
         <!--
              The API key for Google Maps-based APIs is defined as a string resource.
              (See the file "res/values/google_maps_api.xml").
@@ -50,6 +36,13 @@
         <activity android:name=".repairmethods.RepairMethodsMainActivity" />
         <activity android:name=".maintenancedetails.MaintenanceDetailsMainActivity" />
         <activity android:name=".insurance.InsuranceMainActivity" />
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/java/com/sliit/smartserviceassistant/Loging.java

+package com.appsnipp.education;
+
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CompoundButton;
+import android.widget.Spinner;
+import android.widget.Switch;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.widget.ToggleButton;
+
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import android.widget.Toast;
+
+import com.squareup.okhttp.Callback;
+import com.squareup.okhttp.OkHttpClient;
+import com.squareup.okhttp.Request;
+import com.squareup.okhttp.Response;
+
+import java.sql.CallableStatement;
+import java.sql.DriverManager;
+import java.sql.Types;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+
+
+public class Loging extends AppCompatActivity {
+
+    //
+   // EditText textInputEditTextUsername,textInputEditTextPassword;
+    Button buttonLogin;
+    TextView textViewLoging;
+    ProgressBar progressBar;
+    Intent i;
+    Connection conexion=null;
+    TextView textUsername,textPassword;
+    String Confirmusername;
+    String Confirmpassword;
+
+
+    private OkHttpClient mclient;
+
+    private String strURL;
+    //="http://192.168.8.103:8000/api/login?username=hasith&user_pass=1234";//GET
+
+    protected void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+        //for changing status bar icon colors
+        if(Build.VERSION.SDK_INT>= Build.VERSION_CODES.M){
+            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+
+        }
+        setContentView(R.layout.activity_loging);
+
+        textUsername = (TextView) findViewById(R.id.editTextusername);
+        textPassword = (TextView) findViewById(R.id.editTextPassword);
+
+
+        Button sendButton = (Button) findViewById(R.id.cirLoginButton);
+        sendButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                     Confirmusername=textUsername.getText().toString();
+                   Confirmpassword=textPassword.getText().toString();
+
+
+                strURL ="http://192.168.1.6:8000/api/login?username="+Confirmusername+"&user_pass="+Confirmpassword;
+
+                mclient=new OkHttpClient();
+
+                Request request= new Request.Builder().url(strURL).build();
+
+
+
+                mclient.newCall(request).enqueue(new Callback() {
+                    @Override
+                    public void onFailure(Request request, IOException e) {
+
+                    }
+
+                    @Override
+                    public void onResponse(Response response) throws IOException {
+                        if(response.isSuccessful())
+                        {
+
+                            String strJson=response.body().string();
+                            System.out.println(strJson);
+                            if(strJson.equals("ok")==true){
+                                //Toast.makeText(Loging.this, "You form is sucessfull", Toast.LENGTH_SHORT).show();
+
+                                                Intent k = new Intent(Loging.this, MainActivity.class);
+                                                 startActivity(k);
+                                                 finish();
+
+                            }
+
+                        }else{
+                            System.out.println("fail");
+                        }
+                    }
+                });
+
+            }
+        });
+
+
+
+
+
+}
+
+
+//
+    public void onLoginClick(View View){
+
+        startActivity(new Intent(this,SignUp.class));
+        overridePendingTransition(R.anim.slide_in_right,R.anim.stay);
+
+
+    }
+
+
+}

app/src/main/java/com/sliit/smartserviceassistant/MainActivity.java

+package com.sliit.smartserviceassistant;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+import com.sliit.smartserviceassistant.insurance.InsuranceMainActivity;
+import com.sliit.smartserviceassistant.maintenancedetails.MaintenanceDetailsMainActivity;
+import com.sliit.smartserviceassistant.repairmethods.RepairMethodsMainActivity;
+import com.sliit.smartserviceassistant.spareparts.SparePartsMainActivity;
+
+public class MainActivity extends AppCompatActivity {
+
+    private Button btn_insurance;
+    private Button btn_maintenance;
+    private Button btn_repair_methods;
+    private Button btn_spare_parts;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        // Button navigation to insurance function
+        btn_insurance = findViewById(R.id.btn_ins);
+        btn_insurance.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(MainActivity.this, InsuranceMainActivity.class);
+                startActivity(intent);
+            }
+        });
+
+        // Button navigation to maintenance function
+        btn_maintenance = findViewById(R.id.btn_maintenance_details);
+        btn_maintenance.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(MainActivity.this, MaintenanceDetailsMainActivity.class);
+                startActivity(intent);
+            }
+        });
+
+        // Button navigation to repair methods function
+        btn_repair_methods = findViewById(R.id.btn_repair_methods);
+        btn_repair_methods.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(MainActivity.this, RepairMethodsMainActivity.class);
+                startActivity(intent);
+            }
+        });
+
+        // Button navigation to insurance function
+        btn_spare_parts = findViewById(R.id.btn_spare_parts_price);
+        btn_spare_parts.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(MainActivity.this, SparePartsMainActivity.class);
+                startActivity(intent);
+            }
+        });
+    }
+
+}
\ No newline at end of file

app/src/main/java/com/sliit/smartserviceassistant/SignUp.java

+package com.appsnipp.education;
+
+import android.app.DatePickerDialog;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.icu.util.Calendar;
+import android.os.Build;
+import android.support.annotation.RequiresApi;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.text.Layout;
+import android.util.Log;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.DatePicker;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.icu.util.Calendar;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+
+import java.time.Month;
+import java.time.Year;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+import retrofit2.Retrofit;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+
+public class SignUp extends AppCompatActivity {
+
+
+    TextView textName20;
+    TextView textName21;
+    TextView textName22;
+    TextView textName23;
+    TextView textName24;
+    TextView textName25;
+    TextView textName26;
+    TextView text27;
+
+
+    private DatePickerDialog.OnDateSetListener mDateSetListener;
+    private static final String TAG = "MainActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_sign_up);
+        changeStatusBarColor();
+
+
+
+
+        textName20 = (TextView) findViewById(R.id.editTextNameSignUp);
+        textName21 = (TextView) findViewById(R.id.editTextEmailSignUp);
+        textName22 = (TextView) findViewById(R.id.editTextFirstnameSignUp);
+        textName23 = (TextView) findViewById(R.id.editTextLastnameSignUp);
+        textName24 = (TextView) findViewById(R.id.editTextpaswordSignup);
+        textName25 = (TextView) findViewById(R.id.editTextConfirmpaswordSignUp);
+        textName26 = (TextView) findViewById(R.id.editTextDateOfBirthdaySignUp);
+
+        textName26.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @RequiresApi(api = Build.VERSION_CODES.N)
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+                if(hasFocus) {
+                    Calendar cal = Calendar.getInstance();
+                    int year = cal.get(Calendar.YEAR);
+                    int month = cal.get(Calendar.MONTH);
+                    int day = cal.get(Calendar.DAY_OF_MONTH);
+
+                    DatePickerDialog dialog=new DatePickerDialog(SignUp.this, android.R.style.Theme_Holo_Light_Dialog_MinWidth,mDateSetListener,year,month,day);
+                    dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+                    dialog.show();
+                } else {
+                    // Hide your calender here
+                }
+            }
+        });
+//        textName26.setOnClickListener(new View.OnClickListener() {
+//            @RequiresApi(api = Build.VERSION_CODES.N)
+//            @Override
+//            public void onClick(View view) {
+//
+//
+//            }
+//        });
+
+        mDateSetListener = new DatePickerDialog.OnDateSetListener() {
+            @Override
+            public void onDateSet(DatePicker datePicker, int year, int month, int day) {
+                month = month + 1;
+                Log.d(TAG, "onDateSet: mm/dd/yyy: " + month + "/" + day + "/" + year);
+
+                String date = year+"-"+month+"-"+ day;
+                textName26.setText(date);
+            }
+        };
+        final Button button = findViewById(R.id.cirRegisterButton);
+        button.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                if (textName20 .getText().toString().isEmpty() || textName21.getText().toString().isEmpty() ||  textName22.getText().toString().isEmpty()||
+                        textName23.getText().toString().isEmpty() ||
+                        textName24.getText().toString().isEmpty() ||
+                        textName25.getText().toString().isEmpty()){
+//                        textName26.getText().toString().isEmpty()) {
+
+                    System.out.println("HY1");
+                    Toast.makeText(SignUp.this, "Please enter All the values", Toast.LENGTH_SHORT).show();
+
+                    return;
+
+                }else{
+                    System.out.println("HY2");
+
+
+
+                    postData1(textName20.getText().toString(), textName21.getText().toString(),textName22.getText().toString(),textName23.getText().toString(),textName24.getText().toString(),textName25.getText().toString(),textName26.getText().toString());
+
+                    String FullName = textName22.getText().toString()+" "+textName23.getText().toString();
+                    FileOutputStream outputStream;
+                    try{
+                        outputStream = openFileOutput("myfile",MODE_PRIVATE);
+                        outputStream.write(FullName.getBytes());
+                        outputStream.close();
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
+
+
+
+                    Toast.makeText(SignUp.this, "Your Registration is sucessfull", Toast.LENGTH_SHORT).show();
+                }
+
+
+            }
+        });
+
+
+    }
+
+    private void postData1(String username,
+                            String email, String first_name,String last_name,String password,String password2,String date_of_birth
+                          ){
+
+
+
+
+
+        // builder and passing our base url
+        Retrofit retrofit1 = new Retrofit.Builder()
+                .baseUrl("http://192.168.1.6:8000/api/")
+                .addConverterFactory(GsonConverterFactory.create())
+                .build();
+
+
+      RetrofitAPI1 retrofitAPI1 = retrofit1.create(RetrofitAPI1.class);
+////
+        DataModal1 modal1 = new DataModal1(username,email,first_name,last_name,password,password2,date_of_birth);
+////
+        Call<DataModal1> call1 = retrofitAPI1.createPost1(modal1);
+////
+////
+////
+        call1.enqueue(new Callback<DataModal1>() {
+
+            @Override
+            public void onResponse(Call<DataModal1> call1, Response<DataModal1> response) {
+                // this method is called when we get response from our api.
+                Toast.makeText(SignUp.this, "Data added to API", Toast.LENGTH_SHORT).show();
+                DataModal1 responseFromAPI1 = response.body();
+
+
+
+            }
+//
+            @Override
+            public void onFailure(Call<DataModal1> call1, Throwable t) {
+                // setting text to our text view when
+                // we get error response from API.
+                Toast.makeText(SignUp.this, "Data can't added to API", Toast.LENGTH_SHORT).show();
+            }
+        });
+
+
+    }
+    private void changeStatusBarColor() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = getWindow();
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+//            window.setStatusBarColor(Color.TRANSPARENT);
+            window.setStatusBarColor(getResources().getColor(R.color.register_bk_color));
+
+
+        }
+    }
+
+    public void onLoginClick(View view){
+        startActivity(new Intent(this,Loging.class));
+        overridePendingTransition(R.anim.slide_in_left,android.R.anim.slide_out_right);
+
+    }
+
+
+
+}
\ No newline at end of file

app/src/main/java/com/sliit/smartserviceassistant/spareparts/SparePartsMainActivity.java

@@ -7,6 +7,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
+import com.sliit.smartserviceassistant.MainActivity;
 import com.sliit.smartserviceassistant.R;
 
 public class SparePartsMainActivity extends AppCompatActivity {

app/src/main/res/layout/activity_loging.xml

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+        android:background="@color/whiteBodyColor"
+
+        android:layout_gravity="center"
+        android:focusableInTouchMode="true"
+        android:gravity="center">
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:layout_centerInParent="true"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="-19dp"
+            android:paddingTop="20dp">
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+
+                android:orientation="vertical"
+                android:padding="20dp">
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_gravity="center"
+                    android:layout_height="177dp">
+
+
+                    <TextView
+                        style="@style/viewParent.headerText.NoMode"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentStart="true"
+                        android:layout_alignParentTop="true"
+                        android:layout_marginStart="105dp"
+                        android:layout_marginLeft="132dp"
+                        android:layout_marginTop="75dp"
+                        android:text="LOGIN"
+                        android:textColor="#1C2EC8"
+                        android:textColorHighlight="#F6F4F4"
+                        android:textSize="60sp"
+                        android:textStyle="bold" />
+
+                </RelativeLayout>
+
+
+                <ImageView
+                    android:layout_gravity="center"
+                    android:id="@+id/imageView2"
+                    android:layout_width="371dp"
+                    android:layout_height="199dp"
+                    android:src="@drawable/app_login" />
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/textInputEmail"
+                    style="@style/parent"
+                    android:layout_marginTop="@dimen/loginViewsMargin"
+                    android:background="@drawable/back"
+                    android:rotationX="0"
+                    android:rotationY="0">
+
+                    <EditText
+                        android:id="@+id/editTextusername"
+                        style="@style/modifiedEditTextAddSignUp"
+                        android:hint="Username"
+                        android:inputType="textEmailAddress"
+                        android:maxLines="1" />
+                </android.support.design.widget.TextInputLayout>
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/textInputPassword"
+                    style="@style/parent"
+
+                    android:layout_marginTop="@dimen/loginViewsMargin"
+                    android:background="@drawable/back">
+
+                    <EditText
+                        android:id="@+id/editTextPassword"
+                        style="@style/modifiedEditTextAddSignUp"
+                        android:hint="password"
+                        android:inputType="textPassword"
+                        android:maxLines="1" />
+                </android.support.design.widget.TextInputLayout>
+
+                <TextView
+                    style="@style/viewParent"
+                    android:layout_gravity="end"
+                    android:layout_marginTop="10dp"
+                    android:text="Forgot Password?"
+                    android:textColor="@color/primaryTextColorL"
+                    android:textSize="@dimen/newsMoreTextSize" />
+
+                <br.com.simplepass.loading_button_lib.customViews.CircularProgressButton
+                    android:id="@+id/cirLoginButton"
+                    style="@style/loginButton"
+                    android:background="@drawable/centre_button"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/loginViewsMargin"
+                    android:text="Login"
+                    app:initialCornerAngle="27dp"
+                    app:spinning_bar_color="#FFF"
+                    app:spinning_bar_padding="6dp"
+                    app:spinning_bar_width="4dp" />
+
+
+                <TextView
+                    android:id="@+id/SignUpTxt"
+                    style="@style/parent"
+                    android:layout_marginTop="@dimen/loginViewsMargin"
+                    android:text="New user? Register Now"
+                    android:textAlignment="center"
+                    android:textColor="@color/themeColor"
+                    android:textSize="20sp"
+                    android:textStyle="bold|italic" />
+
+
+<!--                <LinearLayout-->
+<!--                    android:layout_width="match_parent"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_marginTop="30dp"-->
+<!--                    android:gravity="center"-->
+<!--                    android:weightSum="12">-->
+
+<!--                    <View-->
+<!--                        android:layout_width="0dp"-->
+<!--                        android:layout_height="1dp"-->
+<!--                        android:layout_weight="3"-->
+<!--                        android:background="@color/colorPrimaryDark" />-->
+
+<!--                    <TextView-->
+<!--                        style="@style/viewParent.headerText.NoMode"-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:layout_weight="6"-->
+<!--                        android:text="Use other Methods"-->
+<!--                        android:textAlignment="center"-->
+<!--                        android:textColor="#EBD3EF"-->
+<!--                        android:textSize="12sp" />-->
+
+<!--                    <View-->
+<!--                        android:layout_width="0dp"-->
+<!--                        android:layout_height="1dp"-->
+<!--                        android:layout_weight="3"-->
+<!--                        android:background="@color/colorPrimaryDark" />-->
+
+<!--                </LinearLayout>-->
+
+<!--                <LinearLayout-->
+<!--                    android:layout_width="match_parent"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_marginTop="20dp"-->
+<!--                    android:gravity="center">-->
+
+<!--                    <ImageView-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:src="@drawable/ic_facebook" />-->
+
+<!--                    <ImageView-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:layout_marginLeft="10dp"-->
+<!--                        android:src="@drawable/ic_google_plus" />-->
+<!--                </LinearLayout>-->
+
+            </LinearLayout>
+        </ScrollView>
+
+        <View
+            android:layout_width="11dp"
+            android:layout_height="match_parent"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginTop="20dp"
+            android:background="@drawable/ic_side_bg" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginRight="11dp"
+            android:layout_marginBottom="30dp"
+            android:onClick="onLoginClick"
+            android:src="@drawable/ic_add_img" />
+</RelativeLayout>
\ No newline at end of file

app/src/main/res/layout/activity_main.xml

+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:openDrawer="start">
+
+    <include
+        layout="@layout/app_bar_main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <android.support.design.widget.NavigationView
+        android:id="@+id/nav_view"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:fitsSystemWindows="true"
+        app:headerLayout="@layout/nav_header_main"
+        app:menu="@menu/activity_main_drawer" />
+
+</android.support.v4.widget.DrawerLayout>

app/src/main/res/layout/activity_sign_up.xml

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+
+    android:background="@color/register_bk_color"
+    android:focusableInTouchMode="true"
+    android:gravity="center"
+    android:layout_gravity="center">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="true">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="20dp"
+            android:layout_marginTop="30dp">
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    style="@style/viewParent.headerText"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:text="Registertion Form "
+                    android:textSize="30dp"
+                    android:gravity="center"
+                    android:textColor="@color/whiteTextColor" />
+
+
+            </RelativeLayout>
+
+
+            <android.support.v7.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                app:cardBackgroundColor="@color/whiteTextColor"
+                app:cardCornerRadius="10dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:orientation="vertical">
+
+                    <android.support.design.widget.TextInputLayout
+                        android:id="@+id/textInputName"
+                        style="@style/parent"
+                        android:layout_marginTop="@dimen/loginViewsMargin">
+
+                        <EditText
+                            android:id="@+id/editTextNameSignUp"
+                            style="@style/modifiedEditTextAddSignUp"
+                            android:hint="Name"
+                            android:inputType="textPersonName"
+                            android:maxLines="1" />
+                    </android.support.design.widget.TextInputLayout>
+
+                    <android.support.design.widget.TextInputLayout
+                        android:id="@+id/textInputEmail"
+                        style="@style/parent"
+                        android:layout_marginTop="@dimen/loginViewsMargin">
+
+                        <EditText
+                            android:id="@+id/editTextEmailSignUp"
+                            style="@style/modifiedEditTextAddSignUp"
+                            android:hint="Email"
+                            android:inputType="textEmailAddress"
+                            android:maxLines="1" />
+                    </android.support.design.widget.TextInputLayout>
+
+                    <android.support.design.widget.TextInputLayout
+                        android:id="@+id/textInputFirsename"
+                        style="@style/parent"
+                        android:layout_marginTop="@dimen/loginViewsMargin">
+
+                        <EditText
+                            android:id="@+id/editTextFirstnameSignUp"
+                            style="@style/modifiedEditTextAddSignUp"
+                            android:hint="First name"
+                            android:inputType="textEmailAddress"
+                            android:maxLines="1" />
+                    </android.support.design.widget.TextInputLayout>
+
+                    <android.support.design.widget.TextInputLayout
+                        android:id="@+id/textInputLastname"
+                        style="@style/parent"
+                        android:layout_marginTop="@dimen/loginViewsMargin">
+
+
+                        <EditText
+                            android:id="@+id/editTextLastnameSignUp"
+                            style="@style/modifiedEditTextAddSignUp"
+                            android:hint="Last Name"
+                            android:inputType="textEmailAddress"
+                            android:maxLines="1" />
+                    </android.support.design.widget.TextInputLayout>
+
+                    <android.support.design.widget.TextInputLayout
+                        android:id="@+id/textInputpaswordSignup"
+                        style="@style/parent"
+                        android:layout_marginTop="@dimen/loginViewsMargin">
+
+                        <EditText
+                            android:id="@+id/editTextpaswordSignup"
+                            style="@style/modifiedEditTextAddSignUp"
+                            android:hint="Pasword"
+                            android:inputType="textPassword"
+                            android:maxLines="1" />
+                    </android.support.design.widget.TextInputLayout>
+                    <android.support.design.widget.TextInputLayout
+                        android:id="@+id/textInputConfirmpasword"
+                        style="@style/parent"
+                        android:layout_marginTop="@dimen/loginViewsMargin">
+
+                        <EditText
+                            android:id="@+id/editTextConfirmpaswordSignUp"
+                            style="@style/modifiedEditTextAddSignUp"
+                            android:hint="Confirm Pasword"
+                            android:inputType="textPassword"
+                            android:maxLines="1" />
+                    </android.support.design.widget.TextInputLayout>
+
+                    <android.support.design.widget.TextInputLayout
+                        android:id="@+id/textInputDateOfBirthday"
+                        style="@style/parent"
+                        android:layout_marginTop="@dimen/loginViewsMargin">
+
+                        <EditText
+                            android:id="@+id/editTextDateOfBirthdaySignUp"
+                            style="@style/modifiedEditTextAddSignUp"
+                            android:hint="Date of Birthday(DD/MM/YY)"
+                            android:maxLines="1" />
+                    </android.support.design.widget.TextInputLayout>
+
+                    <br.com.simplepass.loading_button_lib.customViews.CircularProgressButton
+                        android:id="@+id/cirRegisterButton"
+                        style="@style/loginButton"
+                        android:background="#00ADC1"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="@dimen/loginViewsMargin"
+                        android:text="Register"
+                        app:initialCornerAngle="27dp"
+                        app:spinning_bar_color="#FFF"
+                        app:spinning_bar_padding="6dp"
+                        app:spinning_bar_width="4dp" />
+
+                    <TextView
+                        android:id="@+id/Register_val"
+                        style="@style/parent"
+                        android:layout_marginTop="@dimen/loginViewsMargin"
+                        android:onClick="onLoginClick"
+                        android:text="Already have an account?"
+                        android:textAlignment="center"
+                        android:textColor="@color/themeColor"
+                        android:textSize="17sp"
+                        android:textStyle="bold" />
+
+                </LinearLayout>
+            </android.support.v7.widget.CardView>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:layout_marginBottom="30dp"
+                android:gravity="center">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_facebook" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:src="@drawable/ic_google_plus" />
+            </LinearLayout>
+
+
+        </LinearLayout>
+    </ScrollView>
+    <View
+        android:layout_marginTop="20dp"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentRight="true"
+        android:layout_width="11dp"
+        android:layout_height="match_parent"
+        android:background="@drawable/ic_side_bg"/>
+    <ImageView
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_back_img"
+        android:layout_marginRight="11dp"
+        android:layout_marginBottom="30dp"
+        android:onClick="onLoginClick"
+        android:adjustViewBounds="false"/>
+</RelativeLayout>
\ No newline at end of file

app/src/main/res/values/strings.xml

@@ -40,6 +40,7 @@
     </string-array>
 
 
+
     <string-array name="MileageRange">
         <item></item>
         <item>10000</item>
@@ -82,16 +83,7 @@
     <string name="kmthis">200km</string>
 
     <string name="app_name1">salesApp</string>
-    <string name="title_activity_main">MainActivity</string>
-    <string name="title_activity_login">Login</string>
-    <string name="prompt_email">Email</string>
-    <string name="prompt_password">Password</string>
-    <string name="action_sign_in">Sign in or register</string>
-    <string name="action_sign_in_short">Sign in</string>
-    <string name="welcome">"Welcome !"</string>
-    <string name="invalid_username">Not a valid username</string>
-    <string name="invalid_password">Password must be >5 characters</string>
-    <string name="login_failed">"Login failed"</string>
+
 
 
 </resources>