change gradle and chatbot files

parent b2ab227c
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
/.idea/libraries
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
local.properties
/build
\ No newline at end of file
/build
plugins {
id 'com.android.application'
}
apply plugin: 'com.android.application'
android {
compileSdkVersion 30
buildToolsVersion "30.0.3"
defaultConfig {
applicationId "com.sliit.smartserviceassistant"
minSdkVersion 22
applicationId "com.appsnipp.education"
minSdkVersion 17
targetSdkVersion 30
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.google.android.gms:play-services-maps:17.0.1'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
implementation 'net.colindodd:gradientlayout:1.2'
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
implementation 'androidx.appcompat:appcompat:1.2.0'
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'
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
implementation 'com.pierfrancescosoffritti.androidyoutubeplayer:core:10.0.5'
}
\ No newline at end of file
implementation 'com.google.android.gms:play-services-location:17.1.0'
//animated button for login
implementation 'br.com.simplepass:loading-button-android:1.14.0'
implementation 'com.squareup.okhttp:okhttp:2.6.0'
compile 'com.squareup.mimecraft:mimecraft:1.1.1'
}
......@@ -18,4 +18,4 @@
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
\ No newline at end of file
#-renamesourcefileattribute SourceFile
package com.appsnipp.education;
import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
......
......@@ -4,15 +4,15 @@
To get one, follow this link, follow the directions and press "Create" at the end:
https://console.developers.google.com/flows/enableapi?apiid=maps_android_backend&keyType=CLIENT_SIDE_ANDROID&r=1C:1E:BC:46:93:AE:FB:C8:51:C9:10:5A:F8:BB:5A:21:41:A1:CE:48%3Bcom.sliit.smartserviceassistant.spareparts
https://console.developers.google.com/flows/enableapi?apiid=maps_android_backend&keyType=CLIENT_SIDE_ANDROID&r=C8:58:49:D5:D5:53:BC:9D:3D:BC:2D:CD:D6:E9:2E:FA:D3:C1:54:AF%3Bcom.appsnipp.education
You can also add your credentials to an existing key, using these values:
Package name:
com.sliit.smartserviceassistant.spareparts
com.appsnipp.education
SHA-1 certificate fingerprint:
1C:1E:BC:46:93:AE:FB:C8:51:C9:10:5A:F8:BB:5A:21:41:A1:CE:48
C8:58:49:D5:D5:53:BC:9D:3D:BC:2D:CD:D6:E9:2E:FA:D3:C1:54:AF
Alternatively, follow the directions here:
https://developers.google.com/maps/documentation/android/start#get-key
......@@ -20,5 +20,5 @@
Once you have your key (it starts with "AIza"), replace the "google_maps_key"
string in this file.
-->
<string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">AIzaSyCKWN2PtZX1wnhwNqzxF6C_w7twfnPm3Y4</string>
<string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">AIzaSyCtVZYXlsYUUsIUrX7ltT49nJBf3YnlhQU</string>
</resources>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.sliit.smartserviceassistant">
package="com.appsnipp.education">
<!--
The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
Google Maps Android API v2, but you must specify either coarse or fine
location permissions for the "MyLocation" functionality.
-->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:roundIcon="@drawable/conceptcopy"
android:supportsRtl="true"
android:theme="@style/Theme.SmartServiceAssistant">
<activity android:name=".spareparts.StoresListActivity"></activity>
<activity android:name=".insurance.insurance_view" />
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true">
<!--
The API key for Google Maps-based APIs is defined as a string resource.
(See the file "res/values/google_maps_api.xml").
......@@ -29,18 +33,70 @@
android:name="com.google.android.geo.API_KEY"
android:value="@string/google_maps_key" />
<activity android:name=".spareparts.DisplayPriceActivity" />
<activity android:name=".spareparts.SparePartsMainActivity" />
<activity android:name=".repairmethods.RepairMethodsMainActivity" />
<activity android:name=".maintenancedetails.MaintenanceDetailsMainActivity" />
<activity android:name=".insurance.InsuranceMainActivity" />
<activity android:name=".MainActivity">
<activity
android:name=".MapsActivity"
android:label="@string/title_activity_maps">
</activity>
<activity
android:name=".testingchat1"
android:label="@string/title_activity_testingchat1"
android:theme="@style/AppTheme.NoActionBar"></activity>
<activity android:name=".chat_bot"></activity>
<activity
android:name=".Changers_in_two"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".UpComing"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".Changers_in_one"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".predicted_suggestions"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".Prediction"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".SuggestionAnswer"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".Maintainces"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity android:name=".Testing" />
<activity
android:name=".SignUp"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".Loging"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".PredictedMileage"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar">
</activity>
</application>
</manifest>
\ No newline at end of file
package com.sliit.smartserviceassistant;
import android.content.Context;
import android.support.design.widget.BottomNavigationView;
import android.support.design.widget.CoordinatorLayout;
import android.support.v4.view.ViewCompat;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.view.ViewCompat;
import android.util.AttributeSet;
import android.view.View;
import android.widget.FrameLayout;
......
package com.sliit.smartserviceassistant;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.Toast;
......
package com.sliit.smartserviceassistant;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.Toast;
public class Changers_in_two extends AppCompatActivity {
......
package com.sliit.smartserviceassistant;
import android.content.Context;
import android.content.SharedPreferences;
......
......@@ -5,7 +5,7 @@ import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import android.widget.Button;
import android.widget.ImageButton;
......
package com.sliit.smartserviceassistant;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.AdapterView;
......@@ -370,7 +370,7 @@ public class PredictedMileage extends AppCompatActivity implements AdapterView.O
// builder and passing our base url
Retrofit retrofit = new Retrofit.Builder()
.baseUrl("http://192.168.1.101:8000/api/")
.baseUrl("http://192.168.1.5:8000/api/")
.addConverterFactory(GsonConverterFactory.create())
.build();
// Gson gson = new Gson();
......
package com.sliit.smartserviceassistant;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.text.Layout;
import android.view.View;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.TextView;
public class Prediction extends AppCompatActivity {
......
package com.sliit.smartserviceassistant;
import com.sliit.smartserviceassistant.DataModal;
import com.appsnipp.education.DataModal;
import retrofit2.Call;
import retrofit2.http.Body;
......
package com.sliit.smartserviceassistant;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.widget.CardView;
import androidx.cardview.widget.CardView;
import android.view.View;
public class SuggestionAnswer extends AppCompatActivity {
......
package com.sliit.smartserviceassistant;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
......
package com.sliit.smartserviceassistant;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.widget.CardView;
import androidx.cardview.widget.CardView;
import android.view.View;
public class UpComing extends AppCompatActivity {
......
package com.sliit.smartserviceassistant;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
......@@ -13,9 +12,6 @@ import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import java.util.ArrayList;
import java.util.List;
......@@ -165,7 +161,7 @@ public class predicted_suggestions extends AppCompatActivity implements AdapterV
){
Retrofit retrofit2 = new Retrofit.Builder()
.baseUrl("http://192.168.1.101:8000/api/")
.baseUrl("http://192.168.1.5:8000/api/")
.addConverterFactory(GsonConverterFactory.create())
.build();
......
package com.appsnipp.education;
package com.sliit.smartserviceassistant;
import android.os.Bundle;
import androidx.annotation.NonNull;
......
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate android:fromXDelta="-100%p" android:toXDelta="0"
android:duration="@android:integer/config_mediumAnimTime" />
android:duration="@android:integer/config_mediumAnimTime"/>
</set>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<translate xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="@android:integer/config_longAnimTime"
android:fromYDelta="0%p"
android:toYDelta="0%p" />
\ No newline at end of file
android:duration="@android:integer/config_longAnimTime"
android:fromYDelta="0%p"
android:toYDelta="0%p" />
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="@color/bottomNavigationSelectedColor"/>
<item android:state_checked="false" android:color="@color/bottomNavigationTintColor"/>
<item android:state_checked="true" android:color="@color/bottomNavigationSelectedColor" />
<item android:state_checked="false" android:color="@color/bottomNavigationTintColor"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout 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"
......@@ -34,4 +34,4 @@
</ScrollView>
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout 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"
......@@ -80,4 +80,4 @@
</ScrollView>
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
......@@ -10,9 +10,7 @@
android:focusableInTouchMode="true"
android:gravity="center">
<ScrollView
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
......@@ -36,10 +34,8 @@
android:layout_height="177dp">
<TextView
style="@style/viewParent.headerText.NoMode"
style="@style/viewParent.headerText.NoMode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
......@@ -63,7 +59,7 @@
android:layout_height="199dp"
android:src="@drawable/app_login" />
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textInputEmail"
style="@style/parent"
android:layout_marginTop="@dimen/loginViewsMargin"
......@@ -77,9 +73,9 @@
android:hint="Username"
android:inputType="textEmailAddress"
android:maxLines="1" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textInputPassword"
style="@style/parent"
......@@ -92,7 +88,7 @@
android:hint="password"
android:inputType="textPassword"
android:maxLines="1" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<TextView
style="@style/viewParent"
......
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.drawerlayout.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"
......@@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
<android.support.design.widget.NavigationView
<com.google.android.material.navigation.NavigationView
android:id="@+id/nav_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
......@@ -22,4 +22,4 @@
app:headerLayout="@layout/nav_header_main"
app:menu="@menu/activity_main_drawer" />
</android.support.v4.widget.DrawerLayout>
</androidx.drawerlayout.widget.DrawerLayout>
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
......@@ -7,20 +7,16 @@
android:fitsSystemWindows="true"
tools:context="com.appsnipp.education.Maintainces"
android:background="@color/profileBackground">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.design.widget.CollapsingToolbarLayout
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/toolbar_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -89,19 +85,19 @@
</LinearLayout>
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.CollapsingToolbarLayout>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_profile"/>
<include layout="@layout/content_profile" />
</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
......@@ -12,11 +12,11 @@
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/form_app_bar_height"
......@@ -24,7 +24,7 @@
android:fitsSystemWindows="true"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.design.widget.CollapsingToolbarLayout
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/toolbar_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -54,7 +54,7 @@
android:cropToPadding="true"
android:src="@drawable/mileage" />
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textInputEmail"
style="@style/parent"
android:layout_width="match_parent"
......@@ -76,16 +76,16 @@
android:text="Fill your Form"
android:textSize="40dp" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</RelativeLayout>
</android.support.design.widget.CollapsingToolbarLayout>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/vehicle_register_form" />
......@@ -117,4 +117,4 @@
</ScrollView>
</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout 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"
......@@ -69,4 +69,4 @@
</LinearLayout>
</ScrollView>
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout 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"
......@@ -215,4 +215,4 @@
<!-- </LinearLayout>-->
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
......@@ -40,7 +40,7 @@
</RelativeLayout>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
......@@ -53,7 +53,7 @@
android:layout_margin="10dp"
android:orientation="vertical">
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textInputName"
style="@style/parent"
android:layout_marginTop="@dimen/loginViewsMargin">
......@@ -64,9 +64,9 @@
android:hint="Name"
android:inputType="textPersonName"
android:maxLines="1" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textInputEmail"
style="@style/parent"
android:layout_marginTop="@dimen/loginViewsMargin">
......@@ -77,9 +77,9 @@
android:hint="Email"
android:inputType="textEmailAddress"
android:maxLines="1" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textInputFirsename"
style="@style/parent"
android:layout_marginTop="@dimen/loginViewsMargin">
......@@ -90,9 +90,9 @@
android:hint="First name"
android:inputType="textEmailAddress"
android:maxLines="1" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textInputLastname"
style="@style/parent"
android:layout_marginTop="@dimen/loginViewsMargin">
......@@ -104,9 +104,9 @@
android:hint="Last Name"
android:inputType="textEmailAddress"
android:maxLines="1" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textInputpaswordSignup"
style="@style/parent"
android:layout_marginTop="@dimen/loginViewsMargin">
......@@ -117,8 +117,8 @@
android:hint="Pasword"
android:inputType="textPassword"
android:maxLines="1" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textInputConfirmpasword"
style="@style/parent"
android:layout_marginTop="@dimen/loginViewsMargin">
......@@ -129,9 +129,9 @@
android:hint="Confirm Pasword"
android:inputType="textPassword"
android:maxLines="1" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textInputDateOfBirthday"
style="@style/parent"
android:layout_marginTop="@dimen/loginViewsMargin">
......@@ -141,7 +141,7 @@
style="@style/modifiedEditTextAddSignUp"
android:hint="Date of Birthday(DD/MM/YY)"
android:maxLines="1" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<br.com.simplepass.loading_button_lib.customViews.CircularProgressButton
android:id="@+id/cirRegisterButton"
......@@ -167,7 +167,7 @@
android:textStyle="bold" />
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<LinearLayout
android:layout_width="match_parent"
......
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout 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"
xmlns:gl="http://schemas.android.com/apk/res-auto"
......@@ -7,7 +7,7 @@
tools:context="com.appsnipp.education.SuggestionAnswer"
style="@style/parent.contentLayout">
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -28,7 +28,7 @@
<!--Example with RelativeLayout and Gradient Drawable -->
<!-- for Recycler view use any of the layout as model-->
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Oil_Filter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -76,14 +76,14 @@
android:src="@drawable/oil_filter" />
</RelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<!--if the second one is used as model for recyclerView, refer:
-->
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Engine_Oil"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -127,10 +127,10 @@
android:src="@drawable/engineoil" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Washer_Plug_Drain"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -172,10 +172,10 @@
android:src="@drawable/wpd" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Dust_and_Pollen_Filter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -217,9 +217,9 @@
android:src="@drawable/dust_and_pollen_filter" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/WAaB"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -263,9 +263,9 @@
android:src="@drawable/wab" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Air_Clean_Filter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -309,9 +309,9 @@
android:src="@drawable/air_clean" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Fuel_Filter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -353,9 +353,9 @@
android:src="@drawable/ff" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Spark_Plug"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -397,9 +397,9 @@
android:src="@drawable/sparkplug" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Brake_Fluid"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -441,9 +441,9 @@
android:src="@drawable/brake_fluid" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/BaCO"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -485,10 +485,10 @@
android:src="@drawable/break_oil" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Tf"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -530,10 +530,10 @@
android:src="@drawable/tf" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Bp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -575,9 +575,9 @@
android:src="@drawable/breakpads" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Clutch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -619,9 +619,9 @@
android:src="@drawable/clutch" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Coolant"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -661,11 +661,11 @@
android:src="@drawable/cool" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout 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"
xmlns:gl="http://schemas.android.com/apk/res-auto"
......@@ -7,7 +7,7 @@
tools:context="com.appsnipp.education.UpComing"
style="@style/parent.contentLayout">
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -28,7 +28,7 @@
<!--Example with RelativeLayout and Gradient Drawable -->
<!-- for Recycler view use any of the layout as model-->
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Oil_Filter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -76,14 +76,14 @@
android:src="@drawable/oil_filter" />
</RelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<!--if the second one is used as model for recyclerView, refer:
-->
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Engine_Oil"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -127,10 +127,10 @@
android:src="@drawable/engineoil" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Washer_Plug_Drain"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -172,10 +172,10 @@
android:src="@drawable/wpd" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Dust_and_Pollen_Filter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -217,9 +217,9 @@
android:src="@drawable/dust_and_pollen_filter" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/WAaB"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -263,9 +263,9 @@
android:src="@drawable/wab" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Air_Clean_Filter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -309,9 +309,9 @@
android:src="@drawable/air_clean" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Fuel_Filter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -353,9 +353,9 @@
android:src="@drawable/ff" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Spark_Plug"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -397,9 +397,9 @@
android:src="@drawable/sparkplug" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Brake_Fluid"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -441,9 +441,9 @@
android:src="@drawable/brake_fluid" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/BaCO"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -485,10 +485,10 @@
android:src="@drawable/break_oil" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Tf"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -530,10 +530,10 @@
android:src="@drawable/tf" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Bp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -575,9 +575,9 @@
android:src="@drawable/breakpads" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Clutch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -619,9 +619,9 @@
android:src="@drawable/clutch" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/Coolant"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -661,11 +661,11 @@
android:src="@drawable/cool" />
</net.colindodd.gradientlayout.GradientRelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
......@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -22,7 +22,7 @@
android:textColor="@color/whiteTextColor"
android:textSize="50sp" />
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/finalback"
......@@ -76,7 +76,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent" />
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
tools:context="com.appsnipp.education.MainActivity">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:visibility="gone"
android:id="@+id/toolbar"
android:layout_width="match_parent"
......@@ -19,11 +19,11 @@
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_main" />
<android.support.design.widget.BottomNavigationView
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/navigation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -37,4 +37,4 @@
app:itemTextColor="@color/bottom_navigation_color"
app:itemBackground="@color/bottomNavigationBackground"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
......@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -22,7 +22,7 @@
android:textColor="@color/whiteTextColor"
android:textSize="50sp" />
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/finalback"
......@@ -77,7 +77,7 @@ It takes only a minute to check your brake fluid levels. If the level is low, it
app:layout_constraintBottom_toBottomOf="@+id/editTextTextMultiLine13"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
\ No newline at end of file
......@@ -14,7 +14,7 @@
android:layout_height="wrap_content"
android:orientation="vertical" >
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -30,7 +30,7 @@
android:textColor="@color/whiteTextColor"
android:textSize="50sp" />
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="836dp"
android:layout_weight="1"
......@@ -86,8 +86,8 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent" />
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
</ScrollView>
......
......@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -22,7 +22,7 @@
android:textColor="@color/whiteTextColor"
android:textSize="50sp" />
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/finalback"
......@@ -77,7 +77,7 @@
app:layout_constraintBottom_toBottomOf="@+id/editTextTextMultiLine13"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
\ No newline at end of file
......@@ -4,7 +4,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/card_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -47,6 +47,6 @@
</RelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
</LinearLayout>
<android.support.v7.widget.CardView android:layout_width="150dp"
<androidx.cardview.widget.CardView android:layout_width="150dp"
android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
......@@ -11,6 +11,7 @@
android:layout_marginBottom="20dp">
<LinearLayout
android:id="@+id/t1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
......@@ -41,4 +42,4 @@
</LinearLayout>
</android.support.v7.widget.CardView>
\ No newline at end of file
</androidx.cardview.widget.CardView>
\ No newline at end of file
<android.support.v7.widget.CardView android:layout_width="150dp"
<androidx.cardview.widget.CardView android:layout_width="150dp"
android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
......@@ -11,6 +11,7 @@
android:layout_marginBottom="20dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
......@@ -40,4 +41,4 @@
</LinearLayout>
</android.support.v7.widget.CardView>
\ No newline at end of file
</androidx.cardview.widget.CardView>
\ No newline at end of file
<android.support.v7.widget.CardView android:layout_width="150dp"
<androidx.cardview.widget.CardView android:layout_width="150dp"
android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
......@@ -38,4 +38,4 @@
</LinearLayout>
</android.support.v7.widget.CardView>
\ No newline at end of file
</androidx.cardview.widget.CardView>
\ No newline at end of file
<android.support.v7.widget.CardView android:layout_width="150dp"
<androidx.cardview.widget.CardView android:layout_width="150dp"
android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
......@@ -38,4 +38,4 @@
</LinearLayout>
</android.support.v7.widget.CardView>
\ No newline at end of file
</androidx.cardview.widget.CardView>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout 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/linearLayout6"
......@@ -27,5 +27,5 @@
</LinearLayout>
</ScrollView>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
......@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -22,7 +22,7 @@
android:textColor="@color/whiteTextColor"
android:textSize="50sp" />
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/finalback"
......@@ -73,7 +73,7 @@
app:layout_constraintBottom_toBottomOf="@+id/editTextTextMultiLine13"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout 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"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
......@@ -7,7 +7,7 @@
tools:showIn="@layout/app_bar_main"
style="@style/parent.contentLayout">
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -33,7 +33,7 @@
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
......@@ -46,7 +46,7 @@
app:cardPreventCornerOverlap="false">
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<ImageView
android:layout_width="match_parent"
......@@ -64,7 +64,7 @@
<!--remove the below layout with recycler view, use card poplar courses as model for design-->
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/relativeLayout"
android:layout_width="358dp"
android:layout_height="400sp"
......@@ -119,7 +119,7 @@
app:layout_constraintVertical_bias="0.714" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
......@@ -129,6 +129,6 @@
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.core.widget.NestedScrollView 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"
......@@ -173,4 +173,4 @@
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
</androidx.core.widget.NestedScrollView>
\ No newline at end of file
......@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -22,7 +22,7 @@
android:textColor="@color/whiteTextColor"
android:textSize="50sp" />
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/finalback"
......@@ -73,7 +73,7 @@
app:layout_constraintBottom_toBottomOf="@+id/editTextTextMultiLine13"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
\ No newline at end of file
......@@ -14,7 +14,7 @@
android:layout_height="wrap_content"
android:orientation="vertical" >
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -30,7 +30,7 @@
android:textColor="@color/whiteTextColor"
android:textSize="50sp" />
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="1089dp"
android:layout_weight="1"
......@@ -91,8 +91,8 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.388"
app:layout_constraintStart_toStartOf="parent" />
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
</ScrollView>
......
......@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -22,7 +22,7 @@
android:textColor="@color/whiteTextColor"
android:textSize="50sp" />
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/finalback"
......@@ -78,7 +78,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.444"
app:layout_constraintStart_toStartOf="parent" />
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
\ No newline at end of file
......@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -22,7 +22,7 @@
android:textColor="@color/whiteTextColor"
android:textSize="50sp" />
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/finalback"
......@@ -74,7 +74,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent" />
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
\ No newline at end of file
......@@ -7,7 +7,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -23,7 +23,7 @@
android:textColor="@color/whiteTextColor"
android:textSize="50sp" />
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/finalback"
......@@ -83,7 +83,7 @@ Steps: \n\n
app:layout_constraintBottom_toBottomOf="@+id/editTextTextMultiLine13"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
......@@ -43,4 +43,4 @@
</RelativeLayout>
</android.support.v7.widget.CardView>
\ No newline at end of file
</androidx.cardview.widget.CardView>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
......@@ -43,4 +43,4 @@
</RelativeLayout>
</android.support.v7.widget.CardView>
\ No newline at end of file
</androidx.cardview.widget.CardView>
\ No newline at end of file
......@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -22,7 +22,7 @@
android:textColor="@color/whiteTextColor"
android:textSize="50sp" />
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/finalback"
......@@ -75,7 +75,7 @@
app:layout_constraintBottom_toBottomOf="@+id/editTextTextMultiLine13"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
\ No newline at end of file
......@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -22,7 +22,7 @@
android:textColor="@color/whiteTextColor"
android:textSize="50sp" />
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/finalback"
......@@ -78,7 +78,7 @@
app:layout_constraintBottom_toBottomOf="@+id/editTextTextMultiLine13"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.core.widget.NestedScrollView 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"
......@@ -10,7 +10,7 @@ android:background="@drawable/centre_background"
android:focusableInTouchMode="true">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/personalDetailsCard"
style="@style/centreLocatorCardDesignL"
android:layout_marginTop="10dp"
......@@ -20,7 +20,7 @@ android:focusableInTouchMode="true">
app:cardElevation="1dp">
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/linearLayout4"
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -79,7 +79,7 @@ android:focusableInTouchMode="true">
app:layout_constraintHorizontal_bias="0.975"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="380dp"
......@@ -89,7 +89,7 @@ android:focusableInTouchMode="true">
android:orientation="vertical"
android:padding="20dp">
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/TxtVehicleType"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -106,9 +106,9 @@ android:focusableInTouchMode="true">
android:singleLine="true" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/TxtVehicleBrand"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -121,10 +121,10 @@ android:focusableInTouchMode="true">
android:hint="Vehicle Brand Name"
android:inputType="textEmailAddress" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/TxtVehicleModel"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -135,10 +135,10 @@ android:focusableInTouchMode="true">
style="@style/modifiedEditTextAdd"
android:hint="Vehicle Model"
android:inputType="phone" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/TxtMakeYear"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -149,10 +149,10 @@ android:focusableInTouchMode="true">
style="@style/modifiedEditTextAdd"
android:hint="Manufacture Year" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/TxtEngineType"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -165,7 +165,7 @@ android:focusableInTouchMode="true">
android:inputType="textMultiLine"
android:minLines="2" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<!-- <Button-->
......@@ -179,5 +179,5 @@ android:focusableInTouchMode="true">
</LinearLayout>
</android.support.v7.widget.CardView>
</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
</androidx.cardview.widget.CardView>
</androidx.core.widget.NestedScrollView>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.core.widget.NestedScrollView 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"
......@@ -10,7 +10,7 @@ android:background="@drawable/centre_background"
android:focusableInTouchMode="true">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/personalDetailsCard"
style="@style/centreLocatorCardDesignL"
android:layout_marginTop="10dp"
......@@ -20,7 +20,7 @@ android:focusableInTouchMode="true">
app:cardElevation="1dp">
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/linearLayout4"
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -60,7 +60,7 @@ android:focusableInTouchMode="true">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.496" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="380dp"
......@@ -72,7 +72,7 @@ android:focusableInTouchMode="true">
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/TxtMileageRange"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -85,17 +85,17 @@ android:focusableInTouchMode="true">
android:hint="Mileage Range"
android:inputType="textEmailAddress" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/TxtMileage"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
android:layout_height="wrap_content"/>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/TxtOilFilter"
android:layout_width="93dp"
android:layout_height="wrap_content"
......@@ -109,7 +109,7 @@ android:focusableInTouchMode="true">
android:text="Oil Filter" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<!-- <android.support.design.widget.TextInputLayout-->
<!-- android:id="@+id/TxtCost"-->
<!-- android:layout_marginLeft="20sp"-->
......@@ -122,7 +122,7 @@ android:focusableInTouchMode="true">
<!-- android:hint="Cost"-->
<!-- android:inputType="phone" />-->
<!-- </android.support.design.widget.TextInputLayout>-->
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/RunMileage"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -133,7 +133,7 @@ android:focusableInTouchMode="true">
style="@style/modifiedEditTextAdd"
android:hint="Run Mileage"
android:inputType="phone" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<!-- <android.support.design.widget.TextInputLayout-->
<!-- android:id="@+id/NextMileage"-->
......@@ -162,5 +162,5 @@ android:focusableInTouchMode="true">
</LinearLayout>
</android.support.v7.widget.CardView>
</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
</androidx.cardview.widget.CardView>
</androidx.core.widget.NestedScrollView>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.core.widget.NestedScrollView 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"
......@@ -10,7 +10,7 @@ android:background="@drawable/centre_background"
android:focusableInTouchMode="true">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/personalDetailsCard"
style="@style/centreLocatorCardDesignL"
android:layout_marginTop="10dp"
......@@ -20,7 +20,7 @@ android:focusableInTouchMode="true">
app:cardElevation="1dp">
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/linearLayout4"
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -102,7 +102,7 @@ android:focusableInTouchMode="true">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="380dp"
......@@ -112,7 +112,7 @@ android:focusableInTouchMode="true">
android:orientation="vertical"
android:padding="20dp">
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/txtDAPF"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -127,9 +127,9 @@ android:focusableInTouchMode="true">
android:text="Dust and Pollen Fillter" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/txtWAB"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -142,8 +142,8 @@ android:focusableInTouchMode="true">
android:layout_weight="1"
android:text="whell_alignment_and_balancing" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/txtACF"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -156,10 +156,10 @@ android:focusableInTouchMode="true">
android:layout_weight="1"
android:text="Air Clean Filter" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/txtCoolent"
android:layout_width="101dp"
android:layout_height="72dp"
......@@ -171,10 +171,10 @@ android:focusableInTouchMode="true">
android:layout_height="match_parent"
android:layout_weight="1"
android:text="Coolent" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/TxtFF"
android:layout_width="wrap_content"
android:layout_height="70dp"
......@@ -187,10 +187,10 @@ android:focusableInTouchMode="true">
android:layout_weight="1"
android:text="Fuel Filter" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/OilType"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -203,8 +203,8 @@ android:focusableInTouchMode="true">
android:layout_weight="37"
android:text="Break and clutch oil" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/transmission_fluid"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -217,10 +217,10 @@ android:focusableInTouchMode="true">
android:layout_weight="1"
android:text="transmission fluid" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
</androidx.cardview.widget.CardView>
</androidx.core.widget.NestedScrollView>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.core.widget.NestedScrollView 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"
......@@ -10,7 +10,7 @@ android:background="@drawable/centre_background"
android:focusableInTouchMode="true">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/personalDetailsCard"
style="@style/centreLocatorCardDesignL"
android:layout_marginTop="10dp"
......@@ -20,7 +20,7 @@ android:focusableInTouchMode="true">
app:cardElevation="1dp">
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/linearLayout4"
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -90,7 +90,7 @@ android:focusableInTouchMode="true">
app:layout_constraintHorizontal_bias="0.975"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="380dp"
......@@ -100,7 +100,7 @@ android:focusableInTouchMode="true">
android:orientation="vertical"
android:padding="20dp">
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/TxtVehicleType"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -117,9 +117,9 @@ android:focusableInTouchMode="true">
android:singleLine="true" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/TxtVehicleBrand"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -132,10 +132,10 @@ android:focusableInTouchMode="true">
android:hint="Vehicle Brand Name"
android:inputType="textEmailAddress" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/TxtVehicleModel"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -146,10 +146,10 @@ android:focusableInTouchMode="true">
style="@style/modifiedEditTextAdd"
android:hint="Vehicle Model"
android:inputType="phone" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/TxtMakeYear"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -160,10 +160,10 @@ android:focusableInTouchMode="true">
style="@style/modifiedEditTextAdd"
android:hint="Manufacture Year" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/TxtEngineType"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -176,10 +176,10 @@ android:focusableInTouchMode="true">
android:inputType="textMultiLine"
android:minLines="2" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/TxtMileageRange"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -192,9 +192,9 @@ android:focusableInTouchMode="true">
android:hint="Mileage Range"
android:inputType="textEmailAddress" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/TxtMileage"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -206,9 +206,9 @@ android:focusableInTouchMode="true">
android:hint="Mileage"
android:inputType="phone" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/TxtPredictedMileage"
android:layout_marginLeft="20sp"
android:layout_width="269dp"
......@@ -220,7 +220,7 @@ android:focusableInTouchMode="true">
android:hint="Predicted Mileage"
android:inputType="phone" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<RelativeLayout
......@@ -256,5 +256,5 @@ android:focusableInTouchMode="true">
</LinearLayout>
</android.support.v7.widget.CardView>
</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
</androidx.cardview.widget.CardView>
</androidx.core.widget.NestedScrollView>
\ No newline at end of file
......@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -22,7 +22,7 @@
android:textColor="@color/whiteTextColor"
android:textSize="50sp" />
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/finalback"
......@@ -80,7 +80,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.496"
app:layout_constraintStart_toStartOf="parent" />
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
\ No newline at end of file
......@@ -14,7 +14,7 @@
android:layout_height="wrap_content"
android:orientation="vertical" >
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -30,7 +30,7 @@
android:textColor="@color/whiteTextColor"
android:textSize="50sp" />
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/finalback"
......@@ -99,8 +99,8 @@ The wheels are checked again if the imbalance persists.
app:layout_constraintBottom_toBottomOf="@+id/editTextTextMultiLine13"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
</ScrollView>
......
......@@ -18,8 +18,8 @@
<item
android:id="@+id/navigationSearch"
android:icon="@drawable/add_circle"
android:title="Add" />
android:icon="@drawable/ic_baseline_map_24"
android:title="Location" />
<item
android:id="@+id/navigationMyProfile"
......
......@@ -59,6 +59,22 @@
<color name="themeColor">#11CFC5</color>
<!--colors for chat bot-->
<color name="purple_200">#11CFC5</color>
<color name="white">#FFFFFF</color>
<color name="back_color">#132530</color>
<color name="bot_back_color">#203757</color>
<color name="user_back_color">#6968FF</color>
<color name="purple_2001">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
<color name="purple_700">#FF3700B3</color>
<color name="teal_200">#FF03DAC5</color>
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="designMainColor">#13D3B4</color>
......
......@@ -15,5 +15,7 @@
<dimen name="form_app_bar_height">250dp</dimen>
<dimen name="loginViewsMargin">20dp</dimen>
<dimen name="headerTextSize1">30sp</dimen>
<dimen name="appbar_padding">16dp</dimen>
<dimen name="appbar_padding_top">8dp</dimen>
</resources>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item name="include7" type="id">RegisterForm</item>
<!-- <item name="include7" type="id">RegisterForm</item>-->
</resources>
\ No newline at end of file
......@@ -82,12 +82,10 @@
<string name="kmthis">200km</string>
<string name="app_name1">salesApp</string>
<string name="main_btn1">View top Rated</string>
<string name="main_btn2">main_btn2</string>
<string name="main_btn3">main_btn3</string>
<string name="todo">TODO</string>
<string name="view_table_head3">view_table_head3</string>
<string name="view_table_head1">view_table_head1</string>
<string name="title_activity_testingchat1">testingchat1</string>
<string name="tab_text_1">chats</string>
<string name="tab_text_2">profile</string>
<string name="title_activity_maps">Map</string>
</resources>
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.android.tools.build:gradle:4.1.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
......@@ -16,9 +19,10 @@ allprojects {
repositories {
google()
jcenter()
maven { url 'https://jitpack.io' }
}
}
task clean(type: Delete) {
delete rootProject.buildDir
}
\ No newline at end of file
}
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app"s APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
\ No newline at end of file
#Mon May 03 00:02:40 IST 2021
#Thu Jul 08 16:52:55 IST 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
#!/usr/bin/env sh
#!/usr/bin/env bash
##############################################################################
##
......@@ -6,38 +6,20 @@
##
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn () {
warn ( ) {
echo "$*"
}
die () {
die ( ) {
echo
echo "$*"
echo
......@@ -48,7 +30,6 @@ die () {
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
......@@ -59,11 +40,26 @@ case "`uname`" in
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
......@@ -89,7 +85,7 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
......@@ -154,19 +150,11 @@ if $cygwin ; then
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
}
APP_ARGS=$(save "$@")
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
exec "$JAVACMD" "$@"
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
......@@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
......@@ -46,9 +46,10 @@ echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
@rem Get command-line arguments, handling Windowz variants
if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
......@@ -59,6 +60,11 @@ set _SKIP=2
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
goto execute
:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
......
include ':app'
rootProject.name = "Smart Service Assistant"
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment