-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[WIP/Don't Merge] Migrated Profile from Rxjava to Retroift & added MVVM Architecture (part 1) #6082
Draft
neeldoshii
wants to merge
2
commits into
commons-app:main
Choose a base branch
from
neeldoshii:retrofit
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
app/src/main/java/fr/free/nrw/commons/network/APIService.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
package fr.free.nrw.commons.network | ||
|
||
import fr.free.nrw.commons.profile.model.AchievementResponse | ||
import retrofit2.Response | ||
import retrofit2.http.GET | ||
import retrofit2.http.Query | ||
|
||
|
||
interface APIService { | ||
|
||
// https://tools.wmflabs.org/commons-android-app/tool-commons-android-app/uploadsbyuser.py?user=Devanonymous | ||
@GET("uploadsbyuser.py") | ||
suspend fun getImageUploadCount( | ||
@Query("user") username : String | ||
) : Response<Int> | ||
|
||
|
||
// https://tools.wmflabs.org/commons-android-app/tool-commons-android-app//feedback.py?user=Devanonymous | ||
@GET("feedback.py") | ||
suspend fun getUserAchievements( | ||
@Query("user") username: String | ||
) : Response<AchievementResponse> | ||
} |
41 changes: 41 additions & 0 deletions
41
app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementViewModel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
package fr.free.nrw.commons.profile.achievements | ||
|
||
import androidx.lifecycle.ViewModel | ||
import androidx.lifecycle.viewModelScope | ||
import fr.free.nrw.commons.profile.model.UserAchievements | ||
import fr.free.nrw.commons.repository.ProfileRepository | ||
import kotlinx.coroutines.flow.MutableStateFlow | ||
import kotlinx.coroutines.flow.StateFlow | ||
import kotlinx.coroutines.launch | ||
import javax.inject.Inject | ||
|
||
class AchievementViewModel @Inject constructor( | ||
private val repository: ProfileRepository | ||
) : ViewModel() { | ||
|
||
private val _achievements = MutableStateFlow(UserAchievements( | ||
LevelController.LevelInfo.LEVEL_1, | ||
articlesUsingImagesCount = 0, | ||
thanksReceivedCount = 0, | ||
featuredImagesCount = 0, | ||
qualityImagesCount = 0, | ||
imagesUploadedCount = 0, | ||
revertedCount = 0, | ||
uniqueImagesCount = 0, | ||
imagesEditedBySomeoneElseCount = 0 | ||
) | ||
) | ||
val achievements : StateFlow<UserAchievements> = _achievements | ||
|
||
private val _loading = MutableStateFlow(true) | ||
val loading : StateFlow<Boolean> = _loading | ||
|
||
fun getUserAchievements(username: String){ | ||
viewModelScope.launch { | ||
repository.getUserLevel(username = username).collect { | ||
_loading.value = false | ||
_achievements.value = it | ||
} | ||
} | ||
} | ||
} |
23 changes: 23 additions & 0 deletions
23
app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementViewModelFactory.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
package fr.free.nrw.commons.profile.achievements | ||
|
||
import androidx.lifecycle.ViewModel | ||
import androidx.lifecycle.ViewModelProvider | ||
import javax.inject.Inject | ||
import javax.inject.Provider | ||
|
||
/** | ||
* This class extends the ViewModelProvider.Factory and creates a ViewModelFactory class | ||
* for AchievementViewModel | ||
*/ | ||
class AchievementViewModelFactory @Inject constructor( | ||
private val viewModelProvider: Provider<AchievementViewModel> | ||
): ViewModelProvider.Factory { | ||
override fun <T : ViewModel> create(modelClass: Class<T>): T { | ||
if (modelClass.isAssignableFrom(AchievementViewModel::class.java)) { | ||
(@Suppress("UNCHECKED_CAST") | ||
return viewModelProvider.get() as T) | ||
} else { | ||
throw IllegalArgumentException("Unknown class name") | ||
} | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In this should I provide kdoc here? and if yes kdoc should I link the common apps API endpoint doc or provide a CURL link here?