chore: buff v2 with new gradle ver and other minor fixes, ready for v3

app/build.gradle

@@ -12,25 +12,26 @@ def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
-    signingConfigs {
-        release {
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile file(keystoreProperties['storeFile'])
-            storePassword keystoreProperties['storePassword']
-        }
-    }
-    compileSdk 33
-    buildToolsVersion "30.0.3"
+//    signingConfigs {
+//        release {
+//            keyAlias keystoreProperties['keyAlias']
+//            keyPassword keystoreProperties['keyPassword']
+//            storeFile file(keystoreProperties['storeFile'])
+//            storePassword keystoreProperties['storePassword']
+//        }
+//    }
+    compileSdk 35
+//    buildToolsVersion "30.0.3"
 
     defaultConfig {
-        applicationId "com.dscvit.vitty"
+        namespace "com.dscvit.vitty"
         minSdkVersion 24
+        //noinspection OldTargetApi
         targetSdkVersion 33
         versionCode 37
         versionName "2.0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        signingConfig signingConfigs.release
+//        signingConfig signingConfigs.release
     }
 
     buildTypes {
@@ -50,39 +51,40 @@ android {
     buildFeatures {
         viewBinding true
         dataBinding true
+        buildConfig true
     }
 }
 
 dependencies {
 
     // Android Stuff
-    implementation 'androidx.core:core-ktx:1.8.0'
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'com.google.android.material:material:1.6.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.core:core-ktx:1.15.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0'
-    implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.7'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.8.5'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.8.5'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 
     // Firebase
-    implementation platform('com.google.firebase:firebase-bom:27.1.0')
+    implementation platform('com.google.firebase:firebase-bom:33.7.0')
     implementation 'com.google.firebase:firebase-analytics-ktx'
 
     // Firebase Auth
     implementation 'com.google.firebase:firebase-auth-ktx'
-    implementation 'com.google.android.gms:play-services-auth:19.2.0'
+    implementation 'com.google.android.gms:play-services-auth:21.3.0'
 
     // Firestore
-    implementation 'com.google.firebase:firebase-firestore:24.2.0'
+    implementation 'com.google.firebase:firebase-firestore:25.1.1'
 
     // FCM
-    implementation 'com.google.firebase:firebase-messaging:23.0.6'
+    implementation 'com.google.firebase:firebase-messaging:24.1.0'
 
     // Remote Config
     implementation 'com.google.firebase:firebase-config-ktx'
@@ -104,5 +106,5 @@ dependencies {
     // Timber for logs
     implementation 'com.jakewharton.timber:timber:4.7.1'
 
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.12.0'
 }

app/src/main/java/com/dscvit/vitty/App.kt

@@ -16,7 +16,7 @@ class App : Application() {
 
     private val defaultConfig: HashMap<String, Any> =
         hashMapOf(
-            LATEST_VERSION to BuildConfig.VERSION_CODE,
+            LATEST_VERSION to BuildConfig.VERSION_NAME,
             ONLINE_MODE to false
         )
 

app/src/main/java/com/dscvit/vitty/activity/AddInfoActivity.kt

@@ -68,7 +68,7 @@ class AddInfoActivity : AppCompatActivity() {
         }
 
         authViewModel.user.observe(this) {
-            Timber.d("User: ${it}")
+            Timber.d("User: $it")
             if (it != null) {
 
                 val timetableDays = it.timetable?.data
@@ -109,7 +109,7 @@ class AddInfoActivity : AppCompatActivity() {
         })
 
         authViewModel.usernameValidity.observe(this) {
-            Timber.d("Validity: ${it}")
+            Timber.d("Validity: $it")
             if (it != null) {
                 binding.usernameValidity.visibility = View.VISIBLE
                 binding.usernameValidity.text = it.detail

app/src/main/java/com/dscvit/vitty/activity/AuthActivity.kt

@@ -199,7 +199,7 @@ class AuthActivity : AppCompatActivity() {
 
         authViewModel.signInResponse.observe(this) {
             if (it != null) {
-                Timber.d("here--" + it.toString())
+                Timber.d("here--$it")
                 sharedPref.edit().putString(Constants.COMMUNITY_USERNAME, it.username).apply()
                 sharedPref.edit().putString(Constants.COMMUNITY_TOKEN, it.token).apply()
                 sharedPref.edit().putString(Constants.COMMUNITY_NAME, it.name).apply()

app/src/main/java/com/dscvit/vitty/adapter/DayAdapter.kt

@@ -4,7 +4,6 @@ import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.dscvit.vitty.ui.schedule.DayFragment
-import timber.log.Timber
 
 class DayAdapter(fa: Fragment, private val username: String?, private val isFriendsTimetable: Boolean = false) : FragmentStateAdapter(fa) {
     private val numPages = 7

app/src/main/java/com/dscvit/vitty/adapter/SearchAdapter.kt

@@ -1,5 +1,6 @@
 package com.dscvit.vitty.adapter
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -26,7 +27,7 @@ class SearchAdapter(
 ) :
     RecyclerView.Adapter<SearchAdapter.ViewHolder>() {
 
-    val mutableDataSet = dataSet.toMutableList()
+    private val mutableDataSet = dataSet.toMutableList()
 
     class ViewHolder(private val binding: CardRequestBinding) :
         RecyclerView.ViewHolder(binding.root) {
@@ -56,6 +57,7 @@ class SearchAdapter(
         )
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val item = mutableDataSet[holder.adapterPosition]
         holder.bind(item)

app/src/main/java/com/dscvit/vitty/network/api/community/APICommunityRestClient.kt

@@ -22,7 +22,7 @@ class APICommunityRestClient {
     }
 
     private var mApiUser: APICommunity? = null
-    val retrofit = CommunityNetworkClient.retrofitClientCommunity
+    private val retrofit = CommunityNetworkClient.retrofitClientCommunity
 
 
     fun signInWithUsernameRegNo(
@@ -33,7 +33,7 @@ class APICommunityRestClient {
         retrofitSelfUserListener: RetrofitSelfUserListener
     ) {
 
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
+        mApiUser = retrofit.create(APICommunity::class.java)
 
 
         val requestBody = AuthRequestBody(

app/src/main/java/com/dscvit/vitty/network/api/community/CommunityNetworkClient.kt

@@ -1,7 +1,7 @@
 package com.dscvit.vitty.network.api.community
 
 
-import com.dscvit.vitty.util.APIConstants.Community_BASE_URL
+import com.dscvit.vitty.util.APIConstants.COMMUNITY_BASE_URL
 import com.dscvit.vitty.util.APIConstants.TIMEOUT
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
@@ -10,15 +10,15 @@ import java.util.concurrent.TimeUnit
 
 object CommunityNetworkClient {
 
-    var retrofit: Retrofit? = null
+    private var retrofit: Retrofit? = null
 
     val retrofitClientCommunity: Retrofit
         get() {
             if (retrofit == null) {
                 val okHttpClientBuilder = OkHttpClient.Builder()
                 okHttpClientBuilder.connectTimeout(TIMEOUT.toLong(), TimeUnit.SECONDS)
                 retrofit = Retrofit.Builder()
-                    .baseUrl(Community_BASE_URL)
+                    .baseUrl(COMMUNITY_BASE_URL)
                     .addConverterFactory(GsonConverterFactory.create())
                     .client(okHttpClientBuilder.build())
                     .build()

app/src/main/java/com/dscvit/vitty/network/api/events/NetworkClient.kt

@@ -9,7 +9,7 @@ import java.util.concurrent.TimeUnit
 
 object NetworkClient {
 
-    var retrofit: Retrofit? = null
+    private var retrofit: Retrofit? = null
 
     val retrofitClient: Retrofit
         get() {

app/src/main/java/com/dscvit/vitty/util/VITMap.kt

@@ -7,7 +7,7 @@ import android.widget.Toast
 
 object VITMap {
     private const val VIT = "Vellore+Institute+of+Technology,+Vellore+India" // done
-    val blocks: HashMap<String, String> = HashMap()
+    private val blocks: HashMap<String, String> = HashMap()
 
     init {
         blocks["CDMM"] = "Centre+For+Disaster+Mitigation+And+Management,+$VIT"
@@ -38,7 +38,7 @@ object VITMap {
                 mapIntent.setPackage("com.google.android.apps.maps")
                 try {
                     Analytics.navigation(classBlock)
-                } catch (e: Exception) {
+                } catch (_: Exception) {
                 }
                 mapIntent.resolveActivity(context.packageManager)?.let {
                     context.startActivity(mapIntent)