dopamine_20242703_03.phone.stable.dynamic

kotlindevs · Mar 27, 2024 · 5d20168 · 5d20168
1 parent 2988a45
commit 5d20168
Show file tree

Hide file tree

Showing 13 changed files with 240 additions and 134 deletions.
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/Youtube/src/main/java/com/google/android/piyush/youtube/repository/YoutubeRepositoryImpl.kt b/Youtube/src/main/java/com/google/android/piyush/youtube/repository/YoutubeRepositoryImpl.kt
@@ -123,7 +123,7 @@ class YoutubeRepositoryImpl : YoutubeRepository {
                 parameters.append("chart", YoutubeClient.CHART)
                 parameters.append("regionCode", YoutubeClient.REGION_CODE)
                 parameters.append("maxResults", YoutubeClient.MAX_RESULTS)
-                parameters.append("key", "AIzaSyDthuStFPH6bdtsDBFHVm30wjprKKOd5b8")
+                parameters.append("key", YoutubeClient.EXTRA_KEYS)
             }
         }
         return response.body()
@@ -137,7 +137,7 @@ class YoutubeRepositoryImpl : YoutubeRepository {
                 parameters.append("part", YoutubeClient.PLAYLIST_PART)
                 parameters.append("playlistId", playListId)
                 parameters.append("maxResults", YoutubeClient.MAX_RESULTS)
-                parameters.append("key","AIzaSyDthuStFPH6bdtsDBFHVm30wjprKKOd5b8" )
+                parameters.append("key",YoutubeClient.EXTRA_KEYS)
             }
         }
         return response.body()
@@ -151,7 +151,7 @@ class YoutubeRepositoryImpl : YoutubeRepository {
                 parameters.append("part", YoutubeClient.SEARCH_PART)
                 parameters.append("q", query)
                 parameters.append("maxResults", YoutubeClient.MAX_RESULTS)
-                parameters.append("key","AIzaSyDthuStFPH6bdtsDBFHVm30wjprKKOd5b8")
+                parameters.append("key",YoutubeClient.EXTRA_KEYS)
             }
         }
         return response.body()
@@ -164,7 +164,7 @@ class YoutubeRepositoryImpl : YoutubeRepository {
             url {
                 parameters.append("part", YoutubeClient.PART)
                 parameters.append("id", channelId)
-                parameters.append("key", "AIzaSyDthuStFPH6bdtsDBFHVm30wjprKKOd5b8")
+                parameters.append("key", YoutubeClient.EXTRA_KEYS)
             }
         }
         return response.body()
@@ -178,7 +178,7 @@ class YoutubeRepositoryImpl : YoutubeRepository {
                 parameters.append("part", YoutubeClient.PLAYLIST_PART)
                 parameters.append("channelId", channelId)
                 parameters.append("maxResults", YoutubeClient.MAX_RESULTS)
-                parameters.append("key", "AIzaSyDthuStFPH6bdtsDBFHVm30wjprKKOd5b8")
+                parameters.append("key", YoutubeClient.EXTRA_KEYS)
             }
         }
         return response.body()
@@ -192,7 +192,7 @@ class YoutubeRepositoryImpl : YoutubeRepository {
                 parameters.append("part", YoutubeClient.PLAYLIST_PART)
                 parameters.append("playlistId", playListId)
                 parameters.append("maxResults", YoutubeClient.MAX_RESULTS)
-                parameters.append("key", "AIzaSyDthuStFPH6bdtsDBFHVm30wjprKKOd5b8")
+                parameters.append("key", YoutubeClient.EXTRA_KEYS)
             }
         }
         return response.body()
@@ -205,7 +205,7 @@ class YoutubeRepositoryImpl : YoutubeRepository {
             url {
                 parameters.append("part", YoutubeClient.PART)
                 parameters.append("id", videoId)
-                parameters.append("key", "AIzaSyDthuStFPH6bdtsDBFHVm30wjprKKOd5b8")
+                parameters.append("key", YoutubeClient.EXTRA_KEYS)
             }
         }
         return response.body()

diff --git a/Youtube/src/main/java/com/google/android/piyush/youtube/utilities/YoutubeClient.kt b/Youtube/src/main/java/com/google/android/piyush/youtube/utilities/YoutubeClient.kt
@@ -40,9 +40,14 @@ object YoutubeClient {
 
     const val MAX_RESULTS = "50"
 
+    const val PRE_RELEASE = "https://api.npoint.io/255cbfc840e9bf199c9d"
+
     val API_KEY = arrayListOf(
-        "AIzaSyDetnr3eHcdt6oqv_poZkrHB_T63cMRMsc","AIzaSyCgLZsNdWFWuJb4GQvfS_HJvc5n7cV6Pyk","AIzaSyAx7uFZfxSppUJmY4ifXYirVEPB9pdUw2c",
-        "AIzaSyDMQuMItUqW2QrSQUtLtCpKmdCfniKD1zE","AIzaSyDaHGB5Z5nq29U46YGINN4Xjku3f-U8AIs"
+        "AIzaSyDetnr3eHcdt6oqv_poZkrHB_T63cMRMsc","AIzaSyAx7uFZfxSppUJmY4ifXYirVEPB9pdUw2c","AIzaSyDaHGB5Z5nq29U46YGINN4Xjku3f-U8AIs"
+    ).random()
+
+    val EXTRA_KEYS = arrayListOf(
+        "AIzaSyDMQuMItUqW2QrSQUtLtCpKmdCfniKD1zE","AIzaSyCgLZsNdWFWuJb4GQvfS_HJvc5n7cV6Pyk","AIzaSyDthuStFPH6bdtsDBFHVm30wjprKKOd5b8"
     ).random()
 
     val HIDDEN_CLIENT = "https://api.npoint.io/$SHORTS/"
@@ -117,37 +122,47 @@ data class DopamineVersion(
 class DopamineVersionViewModel() : ViewModel() {
     private val _update : MutableLiveData<YoutubeResource<DopamineVersion>> = MutableLiveData()
     val update : MutableLiveData<YoutubeResource<DopamineVersion>> = _update
+
+    private val _preRelease : MutableLiveData<YoutubeResource<DopamineVersion>> = MutableLiveData()
+    val preRelease : MutableLiveData<YoutubeResource<DopamineVersion>> = _preRelease
+
     init{
         try {
             viewModelScope.launch {
                 _update.postValue(YoutubeResource.Loading)
-                val response = getVersion()
-                if(response.url.isNullOrEmpty()) {
-                    _update.postValue(
-                        YoutubeResource.Error(
-                            Exception("Code 521 : Web server is down")
-                        )
+                _update.postValue(
+                    YoutubeResource.Success(
+                        YoutubeClient.CLIENT.get(
+                            YoutubeClient.DOPAMINE_UPDATE
+                        ).body()
                     )
-                }else {
-                    _update.postValue(
+                )
+            }
+        }catch (e : Exception){
+            _update.postValue(YoutubeResource.Error(e))
+        }
+    }
+
+    fun preReleaseUpdate() {
+        viewModelScope.launch {
+            try {
+                viewModelScope.launch {
+                    _preRelease.postValue(YoutubeResource.Loading)
+                    _preRelease.postValue(
                         YoutubeResource.Success(
-                            getVersion()
+                            YoutubeClient.CLIENT.get(
+                                YoutubeClient.PRE_RELEASE
+                            ).body()
                         )
                     )
                 }
+            }catch (e : Exception){
+                _preRelease.postValue(YoutubeResource.Error(e))
             }
-        }catch (e : Exception){
-            _update.postValue(YoutubeResource.Error(e))
         }
     }
 }
 
-suspend fun getVersion() : DopamineVersion {
-    return YoutubeClient.CLIENT.get(
-        YoutubeClient.DOPAMINE_UPDATE
-    ).body()
-}
-
 @Serializable
 data class Developer(
     val userId : String? = null,

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -13,7 +13,7 @@ android {
         minSdk = 24
         targetSdk = 34
         versionCode = 1
-        versionName = "version dopamine_20242603_01.phone.stable.dynamic"
+        versionName = "version dopamine_20242703_03.phone.stable.dynamic"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application
         android:name=".beta.DopamineApp"

diff --git a/app/src/main/java/com/google/android/piyush/dopamine/activities/AboutUs.kt b/app/src/main/java/com/google/android/piyush/dopamine/activities/AboutUs.kt
@@ -9,7 +9,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.piyush.dopamine.R
 import com.google.android.piyush.dopamine.databinding.ActivityAboutUsBinding
 import com.google.android.piyush.dopamine.utilities.NetworkUtilities
-import com.google.android.piyush.dopamine.utilities.ToastUtilities
 import com.google.android.piyush.youtube.utilities.DevelopersViewModel
 import com.google.android.piyush.youtube.utilities.YoutubeResource
 
@@ -21,7 +20,7 @@ class AboutUs(context: Context) : MaterialAlertDialogBuilder(context) {
         setView(binding.root)
         developersViewModel = DevelopersViewModel()
 
-        developersViewModel.devModel.observeForever { it ->
+        developersViewModel.devModel.observeForever {
             when(it){
                 is YoutubeResource.Loading -> {}
                 is YoutubeResource.Success -> {
@@ -207,7 +206,6 @@ class AboutUs(context: Context) : MaterialAlertDialogBuilder(context) {
                         aboutDopamineEffect.visibility = View.VISIBLE
                         aboutDopamineEffect.startShimmer()
                     }
-                    ToastUtilities.showToast(context,it.exception.message.toString())
                 }
             }
         }

diff --git a/app/src/main/java/com/google/android/piyush/dopamine/activities/DopamineHome.kt b/app/src/main/java/com/google/android/piyush/dopamine/activities/DopamineHome.kt
@@ -1,11 +1,13 @@
 package com.google.android.piyush.dopamine.activities
 
+import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
 import androidx.activity.addCallback
 import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
 import androidx.fragment.app.Fragment
 import com.google.android.piyush.dopamine.R
 import com.google.android.piyush.dopamine.databinding.ActivityDopamineHomeBinding
@@ -43,6 +45,17 @@ class DopamineHome : AppCompatActivity() {
             exitProcess(0)
         }
 
+        if(ActivityCompat.checkSelfPermission(this,android.Manifest.permission.POST_NOTIFICATIONS)
+            != PackageManager.PERMISSION_GRANTED
+        ) {
+            ActivityCompat.requestPermissions(
+                this,
+                arrayOf(android.Manifest.permission.POST_NOTIFICATIONS),
+                0
+            )
+        }
+
+
         if(!NetworkUtilities.isNetworkAvailable(this)){
             Utilities.turnOnNetworkDialog(this,"No Internet Connection")
         }