Commit 08d15394 authored by Bhavesh Yadav's avatar Bhavesh Yadav

Changed package name and added firebase project

parent 9ff2835a
...@@ -3,9 +3,6 @@ ...@@ -3,9 +3,6 @@
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<compositeConfiguration>
<compositeBuild compositeDefinitionSource="SCRIPT" />
</compositeConfiguration>
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules"> <option name="modules">
......
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>parkingo</name>
<comment>Project parkingo created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
</projectDescription>
connection.project.dir=
eclipse.preferences.version=1
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/default"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>app</name>
<comment>Project app created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
</projectDescription>
connection.project.dir=..
eclipse.preferences.version=1
...@@ -3,12 +3,12 @@ apply plugin: 'com.android.application' ...@@ -3,12 +3,12 @@ apply plugin: 'com.android.application'
android { android {
compileSdkVersion 28 compileSdkVersion 28
defaultConfig { defaultConfig {
applicationId "com.example.shady.parkingo" applicationId "com.example.infiniteLoop.parkingo"
minSdkVersion 20 minSdkVersion 20
targetSdkVersion 26 targetSdkVersion 26
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {
release { release {
...@@ -23,13 +23,18 @@ android { ...@@ -23,13 +23,18 @@ android {
dependencies { dependencies {
//classpath 'com.android.tools.build:gradle:3.3.0' //classpath 'com.android.tools.build:gradle:3.3.0'
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support.constraint:constraint-layout:1.1.2' implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.android.support:appcompat-v7:28.0.0-alpha3' implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'com.android.support:design:28.0.0' implementation 'com.google.android.material:material:1.0.0'
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
implementation 'com.android.support:cardview-v7:28.0.0-alpha3' implementation 'androidx.cardview:cardview:1.0.0'
implementation 'de.hdodenhof:circleimageview:2.2.0' implementation 'de.hdodenhof:circleimageview:2.2.0'
implementation 'com.google.firebase:firebase-analytics:17.2.0'
//implementation 'com.google.firebase:firebase-core:16.0.9'
implementation 'com.google.firebase:firebase-storage:19.1.0'
} }
apply plugin: 'com.google.gms.google-services'
{
"project_info": {
"project_number": "535354218843",
"firebase_url": "https://parkinggo-37acd.firebaseio.com",
"project_id": "parkinggo-37acd",
"storage_bucket": "parkinggo-37acd.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:535354218843:android:1cb9003647c341e487627e",
"android_client_info": {
"package_name": "com.example.infiniteLoop.parkingo"
}
},
"oauth_client": [
{
"client_id": "535354218843-75to2o2fsgslerr2nfi3icboq0gqt4np.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyDe2WTrmFOszJbtTl76fcWEG-4uz9AfKJg"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "535354218843-75to2o2fsgslerr2nfi3icboq0gqt4np.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}
\ No newline at end of file
package com.example.shady.parkingo; package com.example.infiniteLoop.parkingo;
import android.content.Context; import android.content.Context;
import android.support.test.InstrumentationRegistry; import androidx.test.platform.app.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.shady.parkingo"> package="com.example.infiniteLoop.parkingo">
<application <application
android:allowBackup="true" android:allowBackup="true"
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/appTheme"> android:theme="@style/appTheme">
<activity android:name=".wallets"></activity> <activity android:name="com.example.infiniteLoop.parkingo.wallets"></activity>
<activity <activity
android:name=".SplashActivity" android:name="com.example.infiniteLoop.parkingo.SplashActivity"
android:theme="@style/splash_screen"> android:theme="@style/splash_screen">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
...@@ -19,17 +19,17 @@ ...@@ -19,17 +19,17 @@
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".login_activity" /> <activity android:name="com.example.infiniteLoop.parkingo.login_activity" />
<activity android:name=".dashboard" /> <activity android:name="com.example.infiniteLoop.parkingo.dashboard" />
<activity android:name=".checkin" /> <activity android:name="com.example.infiniteLoop.parkingo.checkin" />
<activity android:name=".ticket" /> <activity android:name="com.example.infiniteLoop.parkingo.ticket" />
<activity android:name=".checkout" /> <activity android:name="com.example.infiniteLoop.parkingo.checkout" />
<activity android:name=".category_wise_availability" /> <activity android:name="com.example.infiniteLoop.parkingo.category_wise_availability" />
<activity android:name=".total_slot_status" /> <activity android:name="com.example.infiniteLoop.parkingo.total_slot_status" />
<activity android:name=".search" /> <activity android:name="com.example.infiniteLoop.parkingo.search" />
<activity android:name=".currentParks" /> <activity android:name="com.example.infiniteLoop.parkingo.currentParks" />
<activity <activity
android:name=".developers" android:name="com.example.infiniteLoop.parkingo.developers"
android:theme="@style/appTheme" /> android:theme="@style/appTheme" />
</application> </application>
......
package com.example.shady.parkingo; package com.example.infiniteLoop.parkingo;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
......
package com.example.shady.parkingo; package com.example.infiniteLoop.parkingo;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
...@@ -15,8 +14,6 @@ import android.widget.RadioGroup; ...@@ -15,8 +14,6 @@ import android.widget.RadioGroup;
import java.util.ArrayList; import java.util.ArrayList;
import static android.content.ContentValues.TAG;
public class category_wise_availability extends Activity { public class category_wise_availability extends Activity {
RadioGroup rg; RadioGroup rg;
......
package com.example.shady.parkingo; package com.example.infiniteLoop.parkingo;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull;
import com.google.android.gms.tasks.OnFailureListener;
import com.google.android.gms.tasks.OnSuccessListener;
import com.google.firebase.storage.FirebaseStorage;
import com.google.firebase.storage.StorageReference;
import com.google.firebase.storage.UploadTask;
import java.io.File;
import static android.content.ContentValues.TAG; import static android.content.ContentValues.TAG;
public class checkin extends Activity { public class checkin extends Activity {
......
package com.example.shady.parkingo; package com.example.infiniteLoop.parkingo;
public class checkin_details { public class checkin_details {
private String name; private String name;
private String vehicle_no; private String vehicle_no;
private long mobile; private long mobile;ort androidx.annotation.NonNull;
import com.google.android.gms.tasks.OnFailureListener;
import com.google.android.gms.tasks.OnSuccessListener;
import com.google.firebase.storage.FirebaseStorage;
import com.google.firebase.storage.StorageReference;
import com.google.firebase.storage.UploadTask;
import java.io.File;
private String slot; private String slot;
private int ticket; private int ticket;
......
package com.example.shady.parkingo; package com.example.infiniteLoop.parkingo;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
...@@ -15,8 +14,6 @@ import android.widget.Toast; ...@@ -15,8 +14,6 @@ import android.widget.Toast;
import java.util.ArrayList; import java.util.ArrayList;
import static android.content.ContentValues.TAG;
public class checkout extends Activity { public class checkout extends Activity {
EditText tkt_no,slot_no; EditText tkt_no,slot_no;
TextView name,mobile,date_tv,slot,vehicle,tkt_tv,ischeckedout; TextView name,mobile,date_tv,slot,vehicle,tkt_tv,ischeckedout;
......
package com.example.shady.parkingo; package com.example.infiniteLoop.parkingo;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.ListView; import android.widget.ListView;
import android.widget.SimpleAdapter; import android.widget.SimpleAdapter;
import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import static android.content.ContentValues.TAG;
public class currentParks extends Activity { public class currentParks extends Activity {
ListView curparks; ListView curparks;
ArrayList al; ArrayList al;
......
package com.example.shady.parkingo; package com.example.infiniteLoop.parkingo;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
...@@ -8,7 +8,7 @@ import android.os.Bundle; ...@@ -8,7 +8,7 @@ import android.os.Bundle;
import android.view.View; import android.view.View;
import android.widget.Toast; import android.widget.Toast;
import static com.example.shady.parkingo.R.*; import static com.example.infiniteLoop.parkingo.R.*;
public class dashboard extends Activity { public class dashboard extends Activity {
......
package com.example.shady.parkingo; package com.example.infiniteLoop.parkingo;
import android.app.Activity; import android.app.Activity;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
public class developers extends Activity { public class developers extends Activity {
......
package com.example.shady.parkingo; package com.example.infiniteLoop.parkingo;
public class login{ public class login{
......
package com.example.shady.parkingo; package com.example.infiniteLoop.parkingo;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
...@@ -55,6 +54,7 @@ public class login_activity extends Activity { ...@@ -55,6 +54,7 @@ public class login_activity extends Activity {
} }
} }
}); });
} }
@Override @Override
......
package com.example.shady.parkingo; package com.example.infiniteLoop.parkingo;
import android.app.Activity; import android.app.Activity;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
public class search extends Activity { public class search extends Activity {
......
package com.example.shady.parkingo; package com.example.infiniteLoop.parkingo;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
...@@ -36,7 +36,6 @@ public class sqlite_ops extends SQLiteOpenHelper{ ...@@ -36,7 +36,6 @@ public class sqlite_ops extends SQLiteOpenHelper{
db.execSQL("insert into slots values(null,'"+slot+"',0,'CAR')"); db.execSQL("insert into slots values(null,'"+slot+"',0,'CAR')");
} }
} }
} }
@Override @Override
......
package com.example.shady.parkingo; package com.example.infiniteLoop.parkingo;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
......
package com.example.shady.parkingo; package com.example.infiniteLoop.parkingo;
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.ListView; import android.widget.ListView;
import android.widget.RadioButton; import android.widget.RadioButton;
......
package com.example.shady.parkingo; package com.example.infiniteLoop.parkingo;
import android.app.Activity; import android.app.Activity;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
public class wallets extends Activity { public class wallets extends Activity {
......
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
android:fontFamily="casual"/> android:fontFamily="casual"/>
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView>--> </android.support.v7.widget.CardView>-->
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/check_in" android:id="@+id/check_in"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="150dp" android:layout_height="150dp"
...@@ -194,9 +194,9 @@ ...@@ -194,9 +194,9 @@
android:textSize="25sp" android:textSize="25sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/vehicle" android:id="@+id/vehicle"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="150dp" android:layout_height="150dp"
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
android:textSize="25sp" android:textSize="25sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
</TableRow> </TableRow>
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/curparks" android:id="@+id/curparks"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="150dp" android:layout_height="150dp"
...@@ -283,9 +283,9 @@ ...@@ -283,9 +283,9 @@
android:textSize="25sp" android:textSize="25sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/prev_parking" android:id="@+id/prev_parking"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="150dp" android:layout_height="150dp"
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
android:textSize="25sp" android:textSize="25sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
</TableRow> </TableRow>
...@@ -336,7 +336,7 @@ ...@@ -336,7 +336,7 @@
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="150dp" android:layout_height="150dp"
android:layout_column="1" android:layout_column="1"
...@@ -374,9 +374,9 @@ ...@@ -374,9 +374,9 @@
android:textSize="25sp" android:textSize="25sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/availability" android:id="@+id/availability"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="150dp" android:layout_height="150dp"
...@@ -413,7 +413,7 @@ ...@@ -413,7 +413,7 @@
android:textSize="25sp" android:textSize="25sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<!--<android.support.v7.widget.CardView <!--<android.support.v7.widget.CardView
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="150dp" android:layout_height="150dp"
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="20dp" android:layout_margin="20dp"
...@@ -61,8 +61,8 @@ ...@@ -61,8 +61,8 @@
android:textSize="30sp" android:textSize="30sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="20dp" android:layout_margin="20dp"
...@@ -88,9 +88,9 @@ ...@@ -88,9 +88,9 @@
android:textSize="30sp" android:textSize="30sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="20dp" android:layout_margin="20dp"
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
android:textSize="30sp" android:textSize="30sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="20dp"> android:paddingTop="20dp">
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/balance" android:id="@+id/balance"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="150dp" android:layout_height="150dp"
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
</TextView> </TextView>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/transactions" android:id="@+id/transactions"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" android:layout_height="70dp"
...@@ -94,8 +94,8 @@ ...@@ -94,8 +94,8 @@
android:textSize="20dp" android:textSize="20dp"
></TextView> ></TextView>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/topup" android:id="@+id/topup"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" android:layout_height="70dp"
...@@ -136,8 +136,8 @@ ...@@ -136,8 +136,8 @@
android:textSize="20dp" android:textSize="20dp"
></TextView> ></TextView>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/withdraw" android:id="@+id/withdraw"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" android:layout_height="70dp"
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
android:textSize="20dp" android:textSize="20dp"
></TextView> ></TextView>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
......
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
android:fontFamily="casual"/> android:fontFamily="casual"/>
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView>--> </android.support.v7.widget.CardView>-->
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/check_in" android:id="@+id/check_in"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="150dp" android:layout_height="150dp"
...@@ -194,9 +194,9 @@ ...@@ -194,9 +194,9 @@
android:textSize="25sp" android:textSize="25sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/vehicle" android:id="@+id/vehicle"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="150dp" android:layout_height="150dp"
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
android:textSize="25sp" android:textSize="25sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
</TableRow> </TableRow>
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/curparks" android:id="@+id/curparks"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="150dp" android:layout_height="150dp"
...@@ -283,9 +283,9 @@ ...@@ -283,9 +283,9 @@
android:textSize="25sp" android:textSize="25sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/prev_parking" android:id="@+id/prev_parking"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="150dp" android:layout_height="150dp"
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
android:textSize="25sp" android:textSize="25sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
</TableRow> </TableRow>
...@@ -336,7 +336,7 @@ ...@@ -336,7 +336,7 @@
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/wallet" android:id="@+id/wallet"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="150dp" android:layout_height="150dp"
...@@ -376,9 +376,9 @@ ...@@ -376,9 +376,9 @@
android:textSize="25sp" android:textSize="25sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/availability" android:id="@+id/availability"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="150dp" android:layout_height="150dp"
...@@ -415,7 +415,7 @@ ...@@ -415,7 +415,7 @@
android:textSize="25sp" android:textSize="25sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<!--<android.support.v7.widget.CardView <!--<android.support.v7.widget.CardView
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="150dp" android:layout_height="150dp"
......
package com.example.shady.parkingo; package com.example.infiniteLoop.parkingo;
import org.junit.Test; import org.junit.Test;
......
...@@ -8,8 +8,7 @@ buildscript { ...@@ -8,8 +8,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.5.1' classpath 'com.android.tools.build:gradle:3.5.1'
classpath 'com.google.gms:google-services:4.3.2'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
} }
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html # http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process. # Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings. # The setting is particularly useful for tweaking memory settings.
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode. # When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit # This option should only be used with decoupled projects. More details, visit
......
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