From 47a5e08188d140f3875a8c7e12e2eaaa501811d2 Mon Sep 17 00:00:00 2001 From: Akarshan Gandotra Date: Sun, 31 Aug 2025 02:09:56 +0530 Subject: [PATCH] Migrate project to AndroidX and update SDK --- app/build.gradle | 28 +++++++++++-------- .../java/layout/BlankFragment.java | 2 +- app/src/androidTest/java/layout/page_1.java | 2 +- app/src/androidTest/java/layout/page_2.java | 2 +- app/src/androidTest/java/layout/page_3.java | 2 +- app/src/main/AndroidManifest.xml | 8 +++--- .../drivelert/FaceTrackerActivity.java | 6 ++-- .../akarshan/drivelert/MainActivity.java | 21 +++++++------- .../example/akarshan/drivelert/contactus.java | 3 +- .../com/example/akarshan/drivelert/end.java | 2 +- .../com/example/akarshan/drivelert/help.java | 12 ++++---- .../akarshan/drivelert/monitor_menu.java | 4 +-- app/src/main/res/layout/activity_help.xml | 12 ++++---- app/src/main/res/layout/activity_main.xml | 6 ++-- app/src/main/res/layout/app_bar_main.xml | 10 +++---- build.gradle | 13 ++++----- gradle.properties | 5 +++- gradle/wrapper/gradle-wrapper.properties | 5 ++-- gradlew | 0 19 files changed, 71 insertions(+), 72 deletions(-) mode change 100644 => 100755 gradlew diff --git a/app/build.gradle b/app/build.gradle index 53de198..9068112 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,31 +1,35 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "24.0.2" + namespace "com.example.akarshan.drivelert" + compileSdk 34 defaultConfig { applicationId "com.drivelert.akarshan.drivelert" - minSdkVersion 16 - targetSdkVersion 23 + minSdk 21 + targetSdk 34 versionCode 5 versionName "1.3" multiDexEnabled true } - buildTypes {2 + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:23.4.0' - compile 'com.android.support:design:23.4.0' - compile 'com.github.bloder:magic:1.1' - compile 'com.google.android.gms:play-services:9.4.0' - compile 'com.android.support:multidex:1.0.0' + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation 'junit:junit:4.13.2' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.10.0' + implementation 'com.github.bloder:magic:1.1' + implementation 'com.google.android.gms:play-services-vision:20.1.3' + implementation 'androidx.multidex:multidex:2.0.1' } diff --git a/app/src/androidTest/java/layout/BlankFragment.java b/app/src/androidTest/java/layout/BlankFragment.java index d219694..9968352 100644 --- a/app/src/androidTest/java/layout/BlankFragment.java +++ b/app/src/androidTest/java/layout/BlankFragment.java @@ -3,7 +3,7 @@ import android.content.Context; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/androidTest/java/layout/page_1.java b/app/src/androidTest/java/layout/page_1.java index 16191fe..04668a7 100644 --- a/app/src/androidTest/java/layout/page_1.java +++ b/app/src/androidTest/java/layout/page_1.java @@ -3,7 +3,7 @@ import android.content.Context; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/androidTest/java/layout/page_2.java b/app/src/androidTest/java/layout/page_2.java index 7421ec7..a421e24 100644 --- a/app/src/androidTest/java/layout/page_2.java +++ b/app/src/androidTest/java/layout/page_2.java @@ -3,7 +3,7 @@ import android.content.Context; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/androidTest/java/layout/page_3.java b/app/src/androidTest/java/layout/page_3.java index a5bc059..91d2b2d 100644 --- a/app/src/androidTest/java/layout/page_3.java +++ b/app/src/androidTest/java/layout/page_3.java @@ -3,7 +3,7 @@ import android.content.Context; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 890b81f..a54c831 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ android:versionCode="2"> + android:minSdkVersion="21" + android:targetSdkVersion="34" /> @@ -14,7 +14,7 @@ - \ No newline at end of file + diff --git a/app/src/main/java/com/example/akarshan/drivelert/FaceTrackerActivity.java b/app/src/main/java/com/example/akarshan/drivelert/FaceTrackerActivity.java index 331dd64..fdeb71d 100644 --- a/app/src/main/java/com/example/akarshan/drivelert/FaceTrackerActivity.java +++ b/app/src/main/java/com/example/akarshan/drivelert/FaceTrackerActivity.java @@ -17,9 +17,9 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.os.Bundle; -import android.support.design.widget.Snackbar; -import android.support.v4.app.ActivityCompat; -import android.support.v7.app.AppCompatActivity; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.app.ActivityCompat; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.KeyEvent; import android.view.MotionEvent; diff --git a/app/src/main/java/com/example/akarshan/drivelert/MainActivity.java b/app/src/main/java/com/example/akarshan/drivelert/MainActivity.java index eedb62a..d95b28c 100644 --- a/app/src/main/java/com/example/akarshan/drivelert/MainActivity.java +++ b/app/src/main/java/com/example/akarshan/drivelert/MainActivity.java @@ -6,19 +6,18 @@ import android.content.Intent; import android.os.Bundle; import android.os.Handler; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.multidex.MultiDex; -import android.support.v4.app.FragmentActivity; -import android.support.v7.app.AlertDialog; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; +import androidx.multidex.MultiDex; +import androidx.fragment.app.FragmentActivity; +import androidx.appcompat.app.AlertDialog; import android.view.MotionEvent; import android.view.View; -import android.support.design.widget.NavigationView; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import com.google.android.material.navigation.NavigationView; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.widget.Button; diff --git a/app/src/main/java/com/example/akarshan/drivelert/contactus.java b/app/src/main/java/com/example/akarshan/drivelert/contactus.java index c6edc0a..60dc132 100644 --- a/app/src/main/java/com/example/akarshan/drivelert/contactus.java +++ b/app/src/main/java/com/example/akarshan/drivelert/contactus.java @@ -1,7 +1,6 @@ package com.example.akarshan.drivelert; -import android.support.v4.app.Fragment; -import android.support.v7.app.AppCompatActivity; +import androidx.fragment.app.Fragment; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/example/akarshan/drivelert/end.java b/app/src/main/java/com/example/akarshan/drivelert/end.java index 2769abc..63bfbee 100644 --- a/app/src/main/java/com/example/akarshan/drivelert/end.java +++ b/app/src/main/java/com/example/akarshan/drivelert/end.java @@ -1,7 +1,7 @@ package com.example.akarshan.drivelert; import android.content.Intent; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/main/java/com/example/akarshan/drivelert/help.java b/app/src/main/java/com/example/akarshan/drivelert/help.java index 80495b7..965c8a5 100644 --- a/app/src/main/java/com/example/akarshan/drivelert/help.java +++ b/app/src/main/java/com/example/akarshan/drivelert/help.java @@ -1,12 +1,12 @@ package com.example.akarshan.drivelert; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; diff --git a/app/src/main/java/com/example/akarshan/drivelert/monitor_menu.java b/app/src/main/java/com/example/akarshan/drivelert/monitor_menu.java index 8ae36de..d33fa24 100644 --- a/app/src/main/java/com/example/akarshan/drivelert/monitor_menu.java +++ b/app/src/main/java/com/example/akarshan/drivelert/monitor_menu.java @@ -1,9 +1,7 @@ package com.example.akarshan.drivelert; import android.content.Intent; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v7.app.AppCompatActivity; +import androidx.fragment.app.Fragment; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml index f1ac89e..122a780 100644 --- a/app/src/main/res/layout/activity_help.xml +++ b/app/src/main/res/layout/activity_help.xml @@ -1,5 +1,5 @@ - - + - - - - - + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index db65bf7..59d7554 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - - + diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index 91ba18f..259bb42 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -1,5 +1,5 @@ - - - - + - + diff --git a/build.gradle b/build.gradle index 5545318..b422749 100644 --- a/build.gradle +++ b/build.gradle @@ -1,21 +1,18 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { repositories { - jcenter() + google() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' - - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.android.tools.build:gradle:8.2.2' } } allprojects { repositories { - jcenter() + google() + mavenCentral() } } diff --git a/gradle.properties b/gradle.properties index 1d3591c..027ef9d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,7 @@ # 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 \ No newline at end of file +# org.gradle.parallel=true + +android.useAndroidX=true +android.enableJetifier=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 122a0dc..625f126 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Mon Dec 28 10:00:20 PST 2015 +# Updated Gradle wrapper properties +# Generated by migration script distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip diff --git a/gradlew b/gradlew old mode 100644 new mode 100755