Skip to content

Commit

Permalink
dopamine_20242603_01.phone.stable.dynamic
Browse files Browse the repository at this point in the history
  • Loading branch information
@kotlindevs
kotlindevs committed Mar 26, 2024
1 parent a020134 commit 2988a45
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 47 deletions.
4 changes: 2 additions & 2 deletions .idea/deploymentTargetSelector.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Youtube/src/main/java/com/google/android/piyush/youtube/repository/YoutubeRepositoryImpl.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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", "AIzaSyAx7uFZfxSppUJmY4ifXYirVEPB9pdUw2c")
parameters.append("key", "AIzaSyDthuStFPH6bdtsDBFHVm30wjprKKOd5b8")
}
}
return response.body()
Expand All @@ -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","AIzaSyAx7uFZfxSppUJmY4ifXYirVEPB9pdUw2c" )
parameters.append("key","AIzaSyDthuStFPH6bdtsDBFHVm30wjprKKOd5b8" )
}
}
return response.body()
Expand All @@ -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","AIzaSyAx7uFZfxSppUJmY4ifXYirVEPB9pdUw2c")
parameters.append("key","AIzaSyDthuStFPH6bdtsDBFHVm30wjprKKOd5b8")
}
}
return response.body()
Expand All @@ -164,7 +164,7 @@ class YoutubeRepositoryImpl : YoutubeRepository {
url {
parameters.append("part", YoutubeClient.PART)
parameters.append("id", channelId)
parameters.append("key", "AIzaSyAx7uFZfxSppUJmY4ifXYirVEPB9pdUw2c")
parameters.append("key", "AIzaSyDthuStFPH6bdtsDBFHVm30wjprKKOd5b8")
}
}
return response.body()
Expand All @@ -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", "AIzaSyAx7uFZfxSppUJmY4ifXYirVEPB9pdUw2c")
parameters.append("key", "AIzaSyDthuStFPH6bdtsDBFHVm30wjprKKOd5b8")
}
}
return response.body()
Expand All @@ -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", "AIzaSyAx7uFZfxSppUJmY4ifXYirVEPB9pdUw2c")
parameters.append("key", "AIzaSyDthuStFPH6bdtsDBFHVm30wjprKKOd5b8")
}
}
return response.body()
Expand All @@ -205,7 +205,7 @@ class YoutubeRepositoryImpl : YoutubeRepository {
url {
parameters.append("part", YoutubeClient.PART)
parameters.append("id", videoId)
parameters.append("key", "AIzaSyAx7uFZfxSppUJmY4ifXYirVEPB9pdUw2c")
parameters.append("key", "AIzaSyDthuStFPH6bdtsDBFHVm30wjprKKOd5b8")
}
}
return response.body()
Expand Down
48 changes: 15 additions & 33 deletions Youtube/src/main/java/com/google/android/piyush/youtube/utilities/YoutubeClient.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ object YoutubeClient {
const val MAX_RESULTS = "50"

val API_KEY = arrayListOf(
"AIzaSyDetnr3eHcdt6oqv_poZkrHB_T63cMRMsc","AIzaSyCgLZsNdWFWuJb4GQvfS_HJvc5n7cV6Pyk","AIzaSyDthuStFPH6bdtsDBFHVm30wjprKKOd5b8",
"AIzaSyDetnr3eHcdt6oqv_poZkrHB_T63cMRMsc","AIzaSyCgLZsNdWFWuJb4GQvfS_HJvc5n7cV6Pyk","AIzaSyAx7uFZfxSppUJmY4ifXYirVEPB9pdUw2c",
"AIzaSyDMQuMItUqW2QrSQUtLtCpKmdCfniKD1zE","AIzaSyDaHGB5Z5nq29U46YGINN4Xjku3f-U8AIs"
).random()

Expand All @@ -59,8 +59,6 @@ object YoutubeClient {

const val DOPAMINE_UPDATE = "https://api.npoint.io/0178e5b07792668c9a58"

const val PRE_RELEASE = "https://api.npoint.io/255cbfc840e9bf199c9d"

const val EXPERIMENTAL_API = "https://yt.lemnoslife.com/noKey/"

val CODING_VIDEOS = arrayListOf(
Expand Down Expand Up @@ -119,39 +117,27 @@ 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 {
_update.postValue(YoutubeResource.Loading)
viewModelScope.launch {
_update.postValue(
YoutubeResource.Success(
getVersion()
_update.postValue(YoutubeResource.Loading)
val response = getVersion()
if(response.url.isNullOrEmpty()) {
_update.postValue(
YoutubeResource.Error(
Exception("Code 521 : Web server is down")
)
)
)
}
}catch (e : Exception){
_update.postValue(YoutubeResource.Error(e))
}
}

fun preReleaseUpdate() {
viewModelScope.launch {
try {
_preRelease.postValue(YoutubeResource.Loading)
viewModelScope.launch {
_preRelease.postValue(
}else {
_update.postValue(
YoutubeResource.Success(
getPreRelease()
getVersion()
)
)
}
}catch (e : Exception){
_preRelease.postValue(YoutubeResource.Error(e))
}
}catch (e : Exception){
_update.postValue(YoutubeResource.Error(e))
}
}
}
Expand All @@ -162,12 +148,6 @@ suspend fun getVersion() : DopamineVersion {
).body()
}

suspend fun getPreRelease() : DopamineVersion {
return YoutubeClient.CLIENT.get(
YoutubeClient.PRE_RELEASE
).body()
}

@Serializable
data class Developer(
val userId : String? = null,
Expand Down Expand Up @@ -200,6 +180,8 @@ class DevelopersViewModel : ViewModel() {
).body<List<Developer>>()
if(response.isNotEmpty()){
_devModel.postValue(YoutubeResource.Success(response))
}else{
_devModel.postValue(YoutubeResource.Error(Exception("Code 521 : Web server is down")))
}
}catch (exception : Exception){
_devModel.postValue(YoutubeResource.Error(exception))
Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ android {
minSdk = 24
targetSdk = 34
versionCode = 1
versionName = "version dopamine_20242503_01.phone.stable.dynamic"
versionName = "version dopamine_20242603_01.phone.stable.dynamic"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/com/google/android/piyush/dopamine/activities/AboutDeveloper.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import com.bumptech.glide.Glide
import com.google.android.material.carousel.CarouselLayoutManager
import com.google.android.material.carousel.CarouselSnapHelper
import com.google.android.material.carousel.MultiBrowseCarouselStrategy
import com.google.android.material.snackbar.Snackbar
import com.google.android.piyush.dopamine.R
import com.google.android.piyush.dopamine.databinding.ActivityAboutDeveloperBinding
import com.google.android.piyush.dopamine.utilities.Utilities
Expand Down Expand Up @@ -129,7 +130,9 @@ class AboutDeveloper : AppCompatActivity() {
}
}
}
is YoutubeResource.Error -> {}
is YoutubeResource.Error -> {
Snackbar.make(binding.root, it.exception.message.toString(), Snackbar.LENGTH_LONG).show()
}
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/google/android/piyush/dopamine/activities/AboutUs.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ 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

Expand Down Expand Up @@ -206,6 +207,7 @@ class AboutUs(context: Context) : MaterialAlertDialogBuilder(context) {
aboutDopamineEffect.visibility = View.VISIBLE
aboutDopamineEffect.startShimmer()
}
ToastUtilities.showToast(context,it.exception.message.toString())
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion app/src/main/java/com/google/android/piyush/dopamine/activities/DopamineUserProfile.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import com.google.android.piyush.dopamine.R
import com.google.android.piyush.dopamine.databinding.ActivityDopamineUserProfileBinding
import com.google.android.piyush.dopamine.utilities.CustomDialog
import com.google.android.piyush.dopamine.utilities.NetworkUtilities
import com.google.android.piyush.dopamine.utilities.ToastUtilities
import com.google.android.piyush.dopamine.utilities.Utilities
import com.google.android.piyush.youtube.utilities.DopamineVersionViewModel
import com.google.android.piyush.youtube.utilities.YoutubeResource
Expand Down Expand Up @@ -238,7 +239,10 @@ class DopamineUserProfile : AppCompatActivity() {
}

is YoutubeResource.Error -> {
Log.d(ContentValues.TAG, update.exception.message.toString())
ToastUtilities.showToast(
context = this,
message = update.exception.message.toString()
)
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/google/android/piyush/dopamine/utilities/DopamineUtilities.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ object Utilities {
const val PERMISSION_REQUEST_CODE = 100
const val PROCESS_ID = "MyDlProcess"
const val PROJECT_ID = "com.google.android.piyush.dopamine"
const val RELEASE_DATE = "24/03/2024"
const val PROJECT_VERSION = "dopamine_20242503_01.phone.stable.dynamic"
const val RELEASE_DATE = "26/03/2024"
const val PROJECT_VERSION = "dopamine_20242603_01.phone.stable.dynamic"
const val STABLE = "stable"
const val DEFAULT_LOGO = "https://cdn-images-1.medium.com/v2/resize:fit:1200/1*3tLD4Ve66pbBpuawm9Fu9Q.png"
const val DEFAULT_BANNER = "https://developer.android.com/static/images/social/android-developers.png"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_about_us.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@
android:id="@+id/devAjithImage"
android:layout_width="32dp"
android:layout_height="32dp"
android:scaleType="centerCrop"
app:shapeAppearance="@style/ShapeAppearance.Material3.Corner.Full"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
Expand Down

0 comments on commit 2988a45

Please sign in to comment.