diff --git a/app/build.gradle b/app/build.gradle index 4211c84..6b2f8b3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,7 +32,7 @@ android { jvmTarget = "11" } composeOptions { - kotlinCompilerExtensionVersion "1.3.2" + kotlinCompilerExtensionVersion "1.4.2" } packagingOptions { resources { @@ -45,7 +45,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.6.0' + implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' testImplementation 'junit:junit:4.13.2' implementation 'com.google.android.material:material:1.9.0-alpha01' diff --git a/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/activities/MainActivity.kt b/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/activities/MainActivity.kt index f2f9693..e38ef98 100644 --- a/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/activities/MainActivity.kt +++ b/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/activities/MainActivity.kt @@ -1,18 +1,3 @@ -package androidbatterystats.bharathvishal.com.androidbatterystats.activities - -import android.annotation.SuppressLint -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent -import android.content.IntentFilter -import android.os.BatteryManager -import android.os.Build -import android.os.Bundle -import androidbatterystats.bharathvishal.com.androidbatterystats.constants.Constants -import androidbatterystats.bharathvishal.com.androidbatterystats.databinding.ActivityMainBinding -import androidx.appcompat.app.AppCompatActivity -import com.google.android.material.color.DynamicColors - /** * * Copyright 2018-2023 Bharath Vishal G. @@ -31,6 +16,22 @@ import com.google.android.material.color.DynamicColors * **/ + +package androidbatterystats.bharathvishal.com.androidbatterystats.activities + +import android.annotation.SuppressLint +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.content.IntentFilter +import android.os.BatteryManager +import android.os.Build +import android.os.Bundle +import androidbatterystats.bharathvishal.com.androidbatterystats.constants.Constants +import androidbatterystats.bharathvishal.com.androidbatterystats.databinding.ActivityMainBinding +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.color.DynamicColors + /* * Created by Bharath Vishal on 20-01-2018. */ diff --git a/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/activities/MainActivityCompose.kt b/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/activities/MainActivityCompose.kt index deb5930..fd27b16 100644 --- a/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/activities/MainActivityCompose.kt +++ b/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/activities/MainActivityCompose.kt @@ -1,3 +1,21 @@ +/** + * + * Copyright 2018-2023 Bharath Vishal G. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + **/ + package androidbatterystats.bharathvishal.com.androidbatterystats.activities import android.annotation.SuppressLint @@ -27,24 +45,6 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.google.android.material.color.DynamicColors -/** - * - * Copyright 2018-2023 Bharath Vishal G. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - **/ - class MainActivityCompose : ComponentActivity() { private lateinit var activityContext: Context diff --git a/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/activities/SplashActivity.kt b/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/activities/SplashActivity.kt index d08cdd4..a2a9a8a 100644 --- a/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/activities/SplashActivity.kt +++ b/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/activities/SplashActivity.kt @@ -1,13 +1,3 @@ -package androidbatterystats.bharathvishal.com.androidbatterystats.activities - -import android.annotation.SuppressLint -import android.content.Context -import android.content.Intent -import android.os.Build -import android.os.Bundle -import androidx.appcompat.app.AppCompatActivity -import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen - /** * * Copyright 2018-2023 Bharath Vishal G. @@ -26,6 +16,16 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen * **/ +package androidbatterystats.bharathvishal.com.androidbatterystats.activities + +import android.annotation.SuppressLint +import android.content.Context +import android.content.Intent +import android.os.Build +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen + class SplashActivity : AppCompatActivity() { private var actvityContext: Context? = null diff --git a/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/application/MyApplication.kt b/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/application/MyApplication.kt index 24717d5..4278218 100644 --- a/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/application/MyApplication.kt +++ b/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/application/MyApplication.kt @@ -1,3 +1,22 @@ +/** + * + * Copyright 2018-2023 Bharath Vishal G. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + **/ + + package androidbatterystats.bharathvishal.com.androidbatterystats.application import android.app.Application diff --git a/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/constants/Constants.kt b/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/constants/Constants.kt index 87ef92e..c40374b 100644 --- a/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/constants/Constants.kt +++ b/app/src/main/java/androidbatterystats/bharathvishal/com/androidbatterystats/constants/Constants.kt @@ -1,6 +1,3 @@ -package androidbatterystats.bharathvishal.com.androidbatterystats.constants - - /** * * Copyright 2018-2023 Bharath Vishal G. @@ -19,6 +16,8 @@ package androidbatterystats.bharathvishal.com.androidbatterystats.constants * **/ +package androidbatterystats.bharathvishal.com.androidbatterystats.constants + /* * Created by Bharath Vishal on 20-01-2018. */ diff --git a/build.gradle b/build.gradle index dcc1f89..0dbd9d4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.7.21' + ext.kotlin_version = '1.8.10' repositories { google() mavenCentral()