diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 674414f..ac6b0ae 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,10 +4,10 @@ \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 37a7509..7bfef59 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/.idea/modules/app/google-services.json b/.idea/modules/app/google-services.json new file mode 100644 index 0000000..6dbd617 --- /dev/null +++ b/.idea/modules/app/google-services.json @@ -0,0 +1,48 @@ +{ + "project_info": { + "project_number": "903475317641", + "firebase_url": "https://arresttb-aead0.firebaseio.com", + "project_id": "arresttb-aead0", + "storage_bucket": "arresttb-aead0.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:903475317641:android:444c2967176c6135eeaf58", + "android_client_info": { + "package_name": "in.sminnovations.arrest_tb" + } + }, + "oauth_client": [ + { + "client_id": "903475317641-hsfvg2fhlgt43g6tnv54fb4191hguqaa.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "in.sminnovations.arrest_tb", + "certificate_hash": "8aeffda288dd8e59580e114a5fe8178766f53ad1" + } + }, + { + "client_id": "903475317641-k1mctjrq1d9f8i23lbr4nova31g2o387.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyDD31gjK4qOIKlEgB5Nz5KO_aOH782B8WQ" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "903475317641-k1mctjrq1d9f8i23lbr4nova31g2o387.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 947a833..e23792d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,16 +1,24 @@ apply plugin: 'com.android.application' +apply plugin: 'com.google.gms.google-services' android { compileSdkVersion 29 buildToolsVersion "29.0.3" + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + defaultConfig { applicationId "in.sminnovations.arrest_tb" minSdkVersion 19 targetSdkVersion 29 versionCode 1 versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + buildTypes { release { minifyEnabled false @@ -24,18 +32,14 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.0.2' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'com.google.firebase:firebase-auth:16.0.5' - implementation 'com.google.firebase:firebase-database:16.0.4' - implementation 'com.google.firebase:firebase-storage:16.0.4' - testImplementation 'junit:junit:4.12' + implementation 'com.chaos.view:pinview:1.4.3' implementation 'com.github.bumptech.glide:glide:4.11.0' - implementation 'com.firebaseui:firebase-ui-database:3.2.2' + implementation 'com.firebaseui:firebase-ui-database:7.1.1' + implementation 'org.tensorflow:tensorflow-lite:+' + implementation 'androidx.browser:browser:1.2.0' implementation 'de.hdodenhof:circleimageview:3.1.0' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.+' @@ -44,6 +48,18 @@ dependencies { implementation 'com.hbb20:ccp:2.4.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + implementation fileTree(dir: "libs", include: ["*.jar"]) + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'com.google.firebase:firebase-config:20.0.0' + implementation 'com.google.firebase:firebase-auth:20.0.1' + + implementation 'com.google.firebase:firebase-database:19.5.1' + implementation 'com.google.firebase:firebase-storage:19.2.0' + testImplementation 'junit:junit:4.12' + implementation 'com.google.android.gms:play-services-location:17.0.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + + } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index f1b4245..481bb43 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -18,4 +18,4 @@ # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/in/sminnovations/arrest_tb/ExampleInstrumentedTest.java b/app/src/androidTest/java/in/sminnovations/arrest_tb/ExampleInstrumentedTest.java index c8c34c3..fafc55a 100644 --- a/app/src/androidTest/java/in/sminnovations/arrest_tb/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/in/sminnovations/arrest_tb/ExampleInstrumentedTest.java @@ -21,7 +21,6 @@ public class ExampleInstrumentedTest { public void useAppContext() { // Context of the app under test. Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals("com.ShanMukhaInnovations.ArrestTB", appContext.getPackageName()); + assertEquals("in.sminnovations.arrest_tb", appContext.getPackageName()); } -} +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4337c56..e04ff48 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,12 +1,13 @@ - - + + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - + + - - - - - + + + + + @@ -70,6 +87,7 @@ diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index 0312436..63def1b 100644 Binary files a/app/src/main/ic_launcher-playstore.png and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/in/sminnovations/arrest_tb/AddImage.java b/app/src/main/java/in/sminnovations/arrest_tb/AddImage.java index a8e9148..406ca2c 100644 --- a/app/src/main/java/in/sminnovations/arrest_tb/AddImage.java +++ b/app/src/main/java/in/sminnovations/arrest_tb/AddImage.java @@ -38,6 +38,7 @@ import com.google.firebase.storage.UploadTask; import com.theartofdev.edmodo.cropper.CropImage; import com.theartofdev.edmodo.cropper.CropImageView; +import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Calendar; diff --git a/app/src/main/java/in/sminnovations/arrest_tb/ForgetPassword.java b/app/src/main/java/in/sminnovations/arrest_tb/ForgetPassword.java index f3cb863..1e9f816 100644 --- a/app/src/main/java/in/sminnovations/arrest_tb/ForgetPassword.java +++ b/app/src/main/java/in/sminnovations/arrest_tb/ForgetPassword.java @@ -1,5 +1,6 @@ package in.sminnovations.arrest_tb; +import android.app.Activity; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; @@ -182,7 +183,7 @@ public class ForgetPassword extends AppCompatActivity { number, 60, TimeUnit.SECONDS, - TaskExecutors.MAIN_THREAD, + (Activity) TaskExecutors.MAIN_THREAD, mCallBack ); } diff --git a/app/src/main/java/in/sminnovations/arrest_tb/ForgetPasswordReset.java b/app/src/main/java/in/sminnovations/arrest_tb/ForgetPasswordReset.java index 50786a2..628fa73 100644 --- a/app/src/main/java/in/sminnovations/arrest_tb/ForgetPasswordReset.java +++ b/app/src/main/java/in/sminnovations/arrest_tb/ForgetPasswordReset.java @@ -12,6 +12,7 @@ import androidx.appcompat.app.AppCompatActivity; import com.google.firebase.database.DatabaseReference; import com.google.firebase.database.FirebaseDatabase; +import com.hbb20.CountryCodePicker; public class ForgetPasswordReset extends AppCompatActivity { private Button next; diff --git a/app/src/main/java/in/sminnovations/arrest_tb/MainActivity.java b/app/src/main/java/in/sminnovations/arrest_tb/MainActivity.java index 9944c42..b0f017f 100644 --- a/app/src/main/java/in/sminnovations/arrest_tb/MainActivity.java +++ b/app/src/main/java/in/sminnovations/arrest_tb/MainActivity.java @@ -134,7 +134,7 @@ info=findViewById(R.id.info); @Override public TestViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.demo, parent, false); + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item, parent, false); TestViewHolder holder = new TestViewHolder(view); return holder; } @@ -197,7 +197,7 @@ info=findViewById(R.id.info); @Override public TestViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.demo, parent, false); + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item, parent, false); TestViewHolder holder = new TestViewHolder(view); return holder; } @@ -254,7 +254,7 @@ info=findViewById(R.id.info); @Override public TestViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.demo, parent, false); + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item, parent, false); TestViewHolder holder = new TestViewHolder(view); return holder; } diff --git a/app/src/main/java/in/sminnovations/arrest_tb/NavigationTop.java b/app/src/main/java/in/sminnovations/arrest_tb/NavigationTop.java index ea42750..e6d1f56 100644 --- a/app/src/main/java/in/sminnovations/arrest_tb/NavigationTop.java +++ b/app/src/main/java/in/sminnovations/arrest_tb/NavigationTop.java @@ -30,7 +30,7 @@ public class NavigationTop extends AppCompatActivity implements NavigationView.O { case R.id.nav_contact_us: - Intent intent1=new Intent(this, About.class); + Intent intent1=new Intent(this,About.class); startActivity(intent1); break; case R.id.nav_home: diff --git a/app/src/main/java/in/sminnovations/arrest_tb/NegativeResults.java b/app/src/main/java/in/sminnovations/arrest_tb/NegativeResults.java index e525a88..2781d76 100644 --- a/app/src/main/java/in/sminnovations/arrest_tb/NegativeResults.java +++ b/app/src/main/java/in/sminnovations/arrest_tb/NegativeResults.java @@ -133,7 +133,7 @@ public class NegativeResults extends NavigationTop { @Override public TestViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.demo, parent, false); + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item, parent, false); TestViewHolder holder = new TestViewHolder(view); return holder; } @@ -186,7 +186,7 @@ public class NegativeResults extends NavigationTop { @Override public TestViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.demo, parent, false); + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item, parent, false); TestViewHolder holder = new TestViewHolder(view); return holder; } diff --git a/app/src/main/java/in/sminnovations/arrest_tb/PatientDetail.java b/app/src/main/java/in/sminnovations/arrest_tb/PatientDetail.java index a94b45a..05b4a2f 100644 --- a/app/src/main/java/in/sminnovations/arrest_tb/PatientDetail.java +++ b/app/src/main/java/in/sminnovations/arrest_tb/PatientDetail.java @@ -6,9 +6,11 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.content.pm.PackageManager; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.widget.AdapterView; @@ -19,6 +21,9 @@ import android.widget.EditText; import android.widget.Spinner; import android.widget.Toast; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; + import java.util.Calendar; public class PatientDetail extends NavigationTop implements AdapterView.OnItemSelectedListener { @@ -26,6 +31,9 @@ public class PatientDetail extends NavigationTop implements AdapterView.OnItemSe private DatePickerDialog.OnDateSetListener mDateSetListener; String patientid,patientdob,patientage,patientnikshayid; String gender; + private GpsTracker gpsTracker; + String lat,logi; + private EditText mDisplayDate,patient_ID,Age,NikshayId; @@ -44,6 +52,7 @@ public class PatientDetail extends NavigationTop implements AdapterView.OnItemSe NikshayId=findViewById(R.id.NikshayID); + ArrayAdapter adapter = ArrayAdapter.createFromResource(this, R.array.Gender, android.R.layout.simple_spinner_item); mDisplayDate.setOnClickListener(new View.OnClickListener() { @@ -89,6 +98,7 @@ public class PatientDetail extends NavigationTop implements AdapterView.OnItemSe next_act.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + getLocation(); patientid = patient_ID.getText().toString(); patientage = Age.getText().toString(); patientnikshayid = NikshayId.getText().toString(); @@ -102,6 +112,10 @@ public class PatientDetail extends NavigationTop implements AdapterView.OnItemSe // editor.putString(Name, phonenum); editor.putString("gender", gender); + editor.putString("longitude", logi); + editor.putString("latitude", lat); + + editor.putString("patientid", patientid); editor.putString("patientage", patientage); editor.putString("patientnikshayid", patientnikshayid); @@ -164,6 +178,24 @@ public class PatientDetail extends NavigationTop implements AdapterView.OnItemSe AlertDialog alert = builder.create(); alert.show(); } + public void getLocation(){ + gpsTracker = new GpsTracker(PatientDetail.this); + if(gpsTracker.canGetLocation()){ + double latitude = gpsTracker.getLatitude(); + lat=String.valueOf(latitude); + + double longitude = gpsTracker.getLongitude(); + logi=String.valueOf(longitude); + + Log.e("main", "error "+latitude); + Log.e("main", "error "+longitude); + + + + }else{ + gpsTracker.showSettingsAlert(); + } + } diff --git a/app/src/main/java/in/sminnovations/arrest_tb/PositiveResult.java b/app/src/main/java/in/sminnovations/arrest_tb/PositiveResult.java index c1ce8eb..3d2dd42 100644 --- a/app/src/main/java/in/sminnovations/arrest_tb/PositiveResult.java +++ b/app/src/main/java/in/sminnovations/arrest_tb/PositiveResult.java @@ -135,7 +135,7 @@ public class PositiveResult extends NavigationTop { @Override public TestViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.demo, parent, false); + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item, parent, false); TestViewHolder holder = new TestViewHolder(view); return holder; } @@ -190,7 +190,7 @@ public class PositiveResult extends NavigationTop { @Override public TestViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.demo, parent, false); + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item, parent, false); TestViewHolder holder = new TestViewHolder(view); return holder; } diff --git a/app/src/main/java/in/sminnovations/arrest_tb/TestDetails.java b/app/src/main/java/in/sminnovations/arrest_tb/TestDetails.java index 6e5c9b9..0c7d09a 100644 --- a/app/src/main/java/in/sminnovations/arrest_tb/TestDetails.java +++ b/app/src/main/java/in/sminnovations/arrest_tb/TestDetails.java @@ -6,6 +6,8 @@ import android.os.Bundle; import android.util.Log; import android.view.LayoutInflater; import android.view.View; +import android.widget.Button; +import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; @@ -16,6 +18,7 @@ import com.google.firebase.database.DatabaseReference; import com.google.firebase.database.FirebaseDatabase; import com.google.firebase.database.ValueEventListener; +import java.io.File; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Calendar; diff --git a/app/src/main/java/in/sminnovations/arrest_tb/VerifyOTP/VerifyOtp.java b/app/src/main/java/in/sminnovations/arrest_tb/VerifyOTP/VerifyOtp.java index 289f6fe..6dbee9d 100644 --- a/app/src/main/java/in/sminnovations/arrest_tb/VerifyOTP/VerifyOtp.java +++ b/app/src/main/java/in/sminnovations/arrest_tb/VerifyOTP/VerifyOtp.java @@ -6,6 +6,7 @@ import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.EditText; +import android.widget.ProgressBar; import android.widget.Toast; import androidx.annotation.NonNull; @@ -19,6 +20,7 @@ import com.google.firebase.FirebaseException; import com.google.firebase.auth.AuthResult; import com.google.firebase.auth.FirebaseAuth; import com.google.firebase.auth.PhoneAuthCredential; +import com.google.firebase.auth.PhoneAuthOptions; import com.google.firebase.auth.PhoneAuthProvider; import java.util.concurrent.TimeUnit; @@ -49,8 +51,7 @@ public class VerifyOtp extends AppCompatActivity { nextactivity = findViewById(R.id.buttonSignIn); mAuth = FirebaseAuth.getInstance(); - - + // mAuth = FirebaseAuth.getInstance().getFirebaseAuthSettings().forceRecaptchaFlowForTesting(); String phonenumberk = getIntent().getStringExtra("numberwithcode"); phonenumberke = getIntent().getStringExtra("mobile"); @@ -111,13 +112,14 @@ public class VerifyOtp extends AppCompatActivity { private void sendVerificationCode(String number){ - PhoneAuthProvider.getInstance().verifyPhoneNumber( - number, - 60, - TimeUnit.SECONDS, - TaskExecutors.MAIN_THREAD, - mCallBack - ); + PhoneAuthOptions options = + PhoneAuthOptions.newBuilder(mAuth) + .setPhoneNumber(number) // Phone number to verify + .setTimeout(60L, TimeUnit.SECONDS) // Timeout and unit + .setActivity(this) // Activity (for callback binding) + .setCallbacks(mCallBack) // OnVerificationStateChangedCallbacks + .build(); + PhoneAuthProvider.verifyPhoneNumber(options); } private PhoneAuthProvider.OnVerificationStateChangedCallbacks diff --git a/app/src/main/java/in/sminnovations/arrest_tb/VerifyOTP/VerifyOtpForgetPassword.java b/app/src/main/java/in/sminnovations/arrest_tb/VerifyOTP/VerifyOtpForgetPassword.java index 32b9e94..aee6f2d 100644 --- a/app/src/main/java/in/sminnovations/arrest_tb/VerifyOTP/VerifyOtpForgetPassword.java +++ b/app/src/main/java/in/sminnovations/arrest_tb/VerifyOTP/VerifyOtpForgetPassword.java @@ -2,6 +2,7 @@ package in.sminnovations.arrest_tb.VerifyOTP; import android.content.Intent; import android.os.Bundle; +import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -19,12 +20,13 @@ import com.google.firebase.FirebaseException; import com.google.firebase.auth.AuthResult; import com.google.firebase.auth.FirebaseAuth; import com.google.firebase.auth.PhoneAuthCredential; +import com.google.firebase.auth.PhoneAuthOptions; import com.google.firebase.auth.PhoneAuthProvider; import java.util.concurrent.TimeUnit; -import in.sminnovations.arrest_tb.ForgetPassword; import in.sminnovations.arrest_tb.ForgetPasswordReset; +import in.sminnovations.arrest_tb.ForgetPassword; import in.sminnovations.arrest_tb.R; @@ -106,13 +108,14 @@ public class VerifyOtpForgetPassword extends AppCompatActivity { private void sendVerificationCode(String number){ - PhoneAuthProvider.getInstance().verifyPhoneNumber( - number, - 60, - TimeUnit.SECONDS, - TaskExecutors.MAIN_THREAD, - mCallBack - ); + PhoneAuthOptions options = + PhoneAuthOptions.newBuilder(mAuth) + .setPhoneNumber(number) // Phone number to verify + .setTimeout(60L, TimeUnit.SECONDS) // Timeout and unit + .setActivity(this) // Activity (for callback binding) + .setCallbacks(mCallBack) // OnVerificationStateChangedCallbacks + .build(); + PhoneAuthProvider.verifyPhoneNumber(options); } private PhoneAuthProvider.OnVerificationStateChangedCallbacks @@ -137,6 +140,7 @@ public class VerifyOtpForgetPassword extends AppCompatActivity { @Override public void onVerificationFailed(FirebaseException e) { // Toast.makeText(VerifyOtpForgetPassword.this, e.getMessage(),Toast.LENGTH_LONG).show(); + Log.e("main", "error " + e.getMessage()); } }; diff --git a/app/src/main/res/drawable-ldpi/logo_app.png b/app/src/main/res/drawable-ldpi/logo_app.png new file mode 100644 index 0000000..e84b5fc Binary files /dev/null and b/app/src/main/res/drawable-ldpi/logo_app.png differ diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml index 1f6bb29..2b068d1 100644 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -4,17 +4,13 @@ android:height="108dp" android:viewportWidth="108" android:viewportHeight="108"> - + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..1f6bb29 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/app/src/main/res/layout/item.xml b/app/src/main/res/layout/item.xml index e50f92b..d15156b 100644 --- a/app/src/main/res/layout/item.xml +++ b/app/src/main/res/layout/item.xml @@ -32,7 +32,7 @@ android:textColor="@color/from" android:textSize="@dimen/msg_text_primary" android:textStyle="bold" - tools:text="Patinet ID"/> + tools:text="Sender name"/> + tools:text="This is the subject of the email"/> + tools:text="This is the body of the email"/> @@ -112,7 +112,7 @@ android:textColor="@color/timestamp" android:textSize="@dimen/timestamp" android:textStyle="bold" - tools:text="Date"/> + tools:text="9:00 AM"/> - - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index b221446..54673c7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ // 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:3.5.1' + classpath "com.android.tools.build:gradle:4.0.1" + classpath 'com.google.gms:google-services:4.2.0' + // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -15,12 +15,13 @@ buildscript { allprojects { repositories { + maven { url 'https://jitpack.io' } + google() jcenter() - } } task clean(type: Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 199d16e..c52ac9b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,15 +6,14 @@ # 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=-Xmx1536m +org.gradle.jvmargs=-Xmx2048m # 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 +# 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 - +android.enableJetifier=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2913118..baf26fb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Sep 27 20:54:38 PDT 2020 +#Fri Nov 13 19:37:01 PST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/settings.gradle b/settings.gradle index 8a81bb8..d23eae7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ include ':app' -rootProject.name='Spin Tube App' +rootProject.name = "arrest_tb" \ No newline at end of file