Kamila/solo game basic #104

kamilababayeva · 2022-03-24T14:21:29Z

This PR is relalted to issue #93

Now the user can choose the genre/artist and play a solo game. The music is playing, the user types the song, and gets the score. In the end, the score is shown.

This PR contains:

ch.sdp.vibester.helper: GameManager: a class that manages the solo game for chosen tag
ch.sdp.vibester: GenreTemporary: update an activity with new buttons for game
ch.sdp.vibester: EndBasicGameTemporary: temporary to show score after the game
ch.sdp.vibester.activity: TypingGameActivity: updated activity to play a solo game of 10 song

There were also small updates in lastfmpi files to fit the solo game.

All the added functionality is tested, the coverage is [92.7%]

codeclimate · 2022-03-28T09:31:52Z

app/src/main/java/ch/sdp/vibester/api/LastfmApiInterface.kt

+    @GET("https://ws.audioscrobbler.com/2.0/")
+    fun getSongList(@QueryMap paramsMap: MutableMap<String, String>): Call<Object>;
+
+    companion object {


Similar blocks of code found in 2 locations. Consider refactoring.

We can extract a general retrofit interface from LastfmApi and LyricsOVHApi to eliminate this duplication

jiabaow

Thanks for all the work you have done! It took me quite a while even to review this PR.
Good job. I leave some comments but it's you to decide if you want to change.

app/src/main/java/ch/sdp/vibester/EndBasicGameTemporary.kt

jiabaow · 2022-03-28T18:55:41Z

app/src/main/java/ch/sdp/vibester/EndBasicGameTemporary.kt

+        setContentView(R.layout.activity_end_basic_game_temporary)
+
+        var bundle = intent.extras
+        var txtView = findViewById<TextView>(R.id.score)


I think we need to have a naming convention for the ids, something like activityNameActualName.

Yes we have to refactor all our id's in the future

jiabaow · 2022-03-28T18:59:10Z

app/src/main/java/ch/sdp/vibester/GenreTemporary.kt

+import org.json.JSONObject
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response

 /**
 * Activity to show the list of songs for a chosen tag
 */
 class GenreTemporary : AppCompatActivity() {
    private val BY_TAG = "tag.gettoptracks"


Will it be a good idea to store these val as constant within lastFM API? 🧐 We might need them somewhere else.

app/src/main/java/ch/sdp/vibester/GenreTemporary.kt

app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt

jiabaow · 2022-03-28T19:15:35Z

app/src/main/java/ch/sdp/vibester/api/LastfmApiInterface.kt

+    @GET("https://ws.audioscrobbler.com/2.0/")
+    fun getSongList(@QueryMap paramsMap: MutableMap<String, String>): Call<Object>;
+
+    companion object {


We can extract a general retrofit interface from LastfmApi and LyricsOVHApi to eliminate this duplication

app/src/main/java/ch/sdp/vibester/helper/GameManager.kt

jiabaow · 2022-03-28T19:20:27Z

app/src/androidTest/java/ch/sdp/vibester/GenreTemporaryTest.kt

-        onView(withId(R.id.songsListView)).check(matches(isDisplayed()))
-        Thread.sleep(1000)   // wait for data to fetch
-        onData(allOf(`is`(instanceOf(String::class.java)))).atPosition(2).perform(click())
+        Thread.sleep(1500)


it might be cleaner to set a const for 1500 since you use it many times

jiabaow · 2022-03-28T19:21:03Z

app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt

@@ -46,7 +46,7 @@ class AuthenticationActivityTest {
        onView(withId(R.id.username)).perform(ViewActions.typeText(username), closeSoftKeyboard())
        onView(withId(R.id.password)).perform(ViewActions.typeText(password), closeSoftKeyboard())
        onView(withId(R.id.logIn)).perform(click())
-        Thread.sleep(3_000)
+        Thread.sleep(5_000)


same here for 5000

jiabaow · 2022-03-28T19:21:51Z

app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt

@@ -40,76 +40,76 @@ class LyricsBelongGameActivityTest {
    fun clean() {
        Intents.release()
    }
-


My bad. This function can be deleted

Co-authored-by: jiabaow <[email protected]>

codeclimate · 2022-03-28T23:39:14Z

Code Climate has analyzed commit 91c5998 and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 92.8% (80% is the threshold).

This pull request will bring the total coverage in the repository to 91.2%.

View more on Code Climate.

MaximeZmt

Nice work !! 👍 Some docs to add when you've got time

MaximeZmt · 2022-03-29T07:04:55Z

app/src/main/java/ch/sdp/vibester/EndBasicGameTemporary.kt

+        setContentView(R.layout.activity_end_basic_game_temporary)
+
+        var bundle = intent.extras
+        var txtView = findViewById<TextView>(R.id.score)


Yes we have to refactor all our id's in the future

MaximeZmt · 2022-03-29T07:06:57Z

app/src/main/java/ch/sdp/vibester/GenreTemporary.kt


 /**
 * Activity to show the list of songs for a chosen tag
 */
 class GenreTemporary : AppCompatActivity() {
    private val BY_TAG = "tag.gettoptracks"
    private val BY_CHART = "chart.gettoptracks"
+    private val BY_ARTIST = "artist.gettoptracks"
+    private val baseurl = "https://ws.audioscrobbler.com/2.0/"


why baseurl is not BASEURL ? not const ?

i have missed the comment. I will add it in my other pr.

MaximeZmt · 2022-03-29T07:07:49Z

app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt

@@ -20,6 +21,7 @@ private const val REQUEST_AUDIO = 100

 class LyricsBelongGameActivity : AppCompatActivity() {
    private lateinit var speechInput : String
+    private val baseUrl = "https://api.lyrics.ovh/"


same here: Shouldn't be BASEURL ?

i have missed the comment. I will add it in my other pr.

MaximeZmt · 2022-03-29T07:08:14Z

app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt

@@ -20,6 +21,7 @@ private const val REQUEST_AUDIO = 100

 class LyricsBelongGameActivity : AppCompatActivity() {


What does the classs represent ? Doc ?

It's my task for this week, I will add it in my PR

MaximeZmt · 2022-03-29T07:10:52Z

app/src/main/java/ch/sdp/vibester/api/ServiceBuilder.kt

+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+object ServiceBuilder {


Doc ? what is this object for ?

i have missed the comment. I will add it in my other pr.

kamilababayeva added 30 commits March 21, 2022 10:39

GameManager: basic Game Manager to set songs and score

362b7c4

GenreTemporary: testing

0581774

TypingGame: modify for GameManager needs

21ee32c

Solve merge issues

d50e2aa

LastfmApi.kt: add extra fields for uri

6e6c1c6

acctivity_end_basic_game.xml: add basic end screen with game score

cb5a0d3

AndroidManifest.xml: adding basic end screen for game

0b0900d

EndBasicGameActivity.kt: activity to show end of the game

ec495d3

LastfmUri.kt: adding extra filed for artisit, set some defaults

e29a32a

Lastfmhelper.kt: remove helper to combine lists for current version

b5db280

SongList.kt: add function to shuffle the list of songList

59b50f2

SongList.kt: separate json field for methods, small fixes

ccf8851

SongList.kt: small fixes and todo

e747c03

activity_genre_temporary.xml: add buttons for genre

4530520

SongList.kt: fix the comments

673dd88

GenreTemporary.kt: add onclick for buttons

90b6f57

EndBasicGameActivity.kt: add text to display in the end

030eb82

TypingGameActivity.kt: add function to play one Game

bacbf25

TypingGameActivity.kt: modify barTime for new gameManager

ed63959

TypingGameActivity.kt: modify typing game for gameManager

f478984

TypingGameActivity.kt: small fixes

201fc5c

TypingGameActivity.kt: make handler global

39c70e2

fixes in the imports

804c55d

GameManager.kt: functions to opreate mediaplayer

bc60ec3

TypingGameActivity.kt: function to operate songs

91b1f59

GenreTemporaryTest.kt: remove wrong tests

bbb2b58

fixes to adapt to the new code

514c759

TypingGameActivity.kt: organize a file

98cc130

TypingGameActivityTest.kt: fix the typing game activity

df3ae9c

GameManager: change setNextSong to correct functionality

3c33ff3

LastfmHelper: add the comment

b9b1dfe

codeclimate bot reviewed Mar 28, 2022

View reviewed changes

kamilababayeva added 9 commits March 28, 2022 11:59

Move checkEndScreen to TypinGameActivityTest

205f770

add test for end activity

02f1485

Move endBasicGameScreenTest

7e00446

LastfmHelper: remove unnecessary code

7f73ec8

LastfmHelperTest: remove unnecessary test

7262a15

LastfmUri: conver data class to hashmap

d29fe88

genreTemporary: simplify the code

e1d7762

change lastfmapi to retrofit

715b7cf

remove tests for lastfmAPI

dbf718d

jiabaow marked this pull request as ready for review March 28, 2022 18:45

jiabaow approved these changes Mar 28, 2022

View reviewed changes

kamilababayeva and others added 13 commits March 28, 2022 23:08

Update app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt

72c8653

Co-authored-by: jiabaow <[email protected]>

Update app/src/main/java/ch/sdp/vibester/GenreTemporary.kt

0001d6b

Co-authored-by: jiabaow <[email protected]>

Update app/src/main/java/ch/sdp/vibester/helper/GameManager.kt

ac8b749

Co-authored-by: jiabaow <[email protected]>

EndBasicGameTemporary: add small comment

ec51fc5

remove create for retrofit interface

9c85e08

ServiceBuilder: create common builder for retrofit

5c62ec4

GameManager: change gamesize name

9d4fb1b

Update code to new retrofit builder

eccdfe8

add cinstants to sleeptime

eebfbd4

remove commented code

2c64d1a

merge main branch

b601db4

fix songlist type

5cd39c7

fix the test

91c5998

MaximeZmt approved these changes Mar 29, 2022

View reviewed changes

kamilababayeva merged commit 235e2ee into main Mar 29, 2022

kamilababayeva deleted the kamila/SoloGame_basic branch March 29, 2022 08:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Kamila/solo game basic #104

Kamila/solo game basic #104

kamilababayeva commented Mar 24, 2022 •

edited

Loading

codeclimate bot Mar 28, 2022

jiabaow Mar 28, 2022

jiabaow left a comment

jiabaow Mar 28, 2022

MaximeZmt Mar 29, 2022

jiabaow Mar 28, 2022

jiabaow Mar 28, 2022

jiabaow Mar 28, 2022

jiabaow Mar 28, 2022

jiabaow Mar 28, 2022

codeclimate bot commented Mar 28, 2022

MaximeZmt left a comment

MaximeZmt Mar 29, 2022

MaximeZmt Mar 29, 2022

kamilababayeva Mar 29, 2022

MaximeZmt Mar 29, 2022

kamilababayeva Mar 29, 2022

MaximeZmt Mar 29, 2022

jiabaow Mar 29, 2022

MaximeZmt Mar 29, 2022

kamilababayeva Mar 29, 2022

		@@ -20,6 +21,7 @@ private const val REQUEST_AUDIO = 100

		class LyricsBelongGameActivity : AppCompatActivity() {

Kamila/solo game basic #104

Kamila/solo game basic #104

Conversation

kamilababayeva commented Mar 24, 2022 • edited Loading

This PR is relalted to issue #93

codeclimate bot Mar 28, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jiabaow left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codeclimate bot commented Mar 28, 2022

MaximeZmt left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kamilababayeva commented Mar 24, 2022 •

edited

Loading