Kamila/display songs endgame #298

kamilababayeva · 2022-05-14T21:58:45Z

This PR creates the first version of EndingGameActivity:

combine IncorrectSongActivity and EndingGameActivity
add SharedPreferences to keep track of game settings

codeclimate · 2022-05-15T08:36:42Z

app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt

-            R.id.rockButton-> chooseGenre(method = LastfmMethod.BY_TAG.method, tag = "rock", mode = R.string.rock.toString())
-            R.id.topTracksButton -> chooseGenre(method = LastfmMethod.BY_CHART.method, mode = R.string.top_tracks.toString())
-            R.id.billieEilishButton -> chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "Billie Eilish", mode = R.string.billie_eilish.toString())
+            R.id.btsButton -> chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "BTS", mode = R.string.bts)


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

codeclimate · 2022-05-15T08:36:42Z

app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt

-            R.id.topTracksButton -> chooseGenre(method = LastfmMethod.BY_CHART.method, mode = R.string.top_tracks.toString())
-            R.id.billieEilishButton -> chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "Billie Eilish", mode = R.string.billie_eilish.toString())
+            R.id.btsButton -> chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "BTS", mode = R.string.bts)
+            R.id.kpopButton -> chooseGenre(method = LastfmMethod.BY_TAG.method, tag = "kpop", mode = R.string.kpop)


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

codeclimate · 2022-05-15T08:36:43Z

app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt

-            R.id.billieEilishButton -> chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "Billie Eilish", mode = R.string.billie_eilish.toString())
+            R.id.btsButton -> chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "BTS", mode = R.string.bts)
+            R.id.kpopButton -> chooseGenre(method = LastfmMethod.BY_TAG.method, tag = "kpop", mode = R.string.kpop)
+            R.id.imagDragonsButton -> chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "Imagine Dragons", mode = R.string.imagine_dragons)


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

codeclimate · 2022-05-15T08:36:43Z

app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt

+            R.id.btsButton -> chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "BTS", mode = R.string.bts)
+            R.id.kpopButton -> chooseGenre(method = LastfmMethod.BY_TAG.method, tag = "kpop", mode = R.string.kpop)
+            R.id.imagDragonsButton -> chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "Imagine Dragons", mode = R.string.imagine_dragons)
+            R.id.rockButton-> chooseGenre(method = LastfmMethod.BY_TAG.method, tag = "rock", mode = R.string.rock)


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

codeclimate · 2022-05-15T08:36:43Z

app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt

+            R.id.imagDragonsButton -> chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "Imagine Dragons", mode = R.string.imagine_dragons)
+            R.id.rockButton-> chooseGenre(method = LastfmMethod.BY_TAG.method, tag = "rock", mode = R.string.rock)
+            R.id.topTracksButton -> chooseGenre(method = LastfmMethod.BY_CHART.method, mode = R.string.top_tracks)
+            R.id.billieEilishButton -> chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "Billie Eilish", mode = R.string.billie_eilish)


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

codeclimate · 2022-05-15T14:32:32Z

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


-        getFromIntent(intent)
-        setFromIntent()
+        findViewById<FloatingActionButton>(R.id.end_returnToMain)


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

codeclimate · 2022-05-15T14:32:32Z

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

-        val incArray: ArrayList<String> = ArrayList(
+
+        //Set list of incorrect songs
+        val incorrectSongList: ArrayList<String> = ArrayList(


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

codeclimate · 2022-05-15T14:32:32Z

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

+        intent.putStringArrayListExtra("incorrectSongList", incorrectSongList)
+
+        //Set list of correct songs
+        val correctSongList: ArrayList<String> = ArrayList(


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

codeclimate · 2022-05-15T14:32:33Z

app/src/main/java/ch/sdp/vibester/database/AppPreferences.kt

+        editor.apply()
+    }
+
+    var gameMode: String?


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

codeclimate · 2022-05-15T14:32:33Z

app/src/main/java/ch/sdp/vibester/database/AppPreferences.kt

+            it.putString(GAME_MODE, value)
+        }
+
+    var gameGenre: String?


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

consider re-group these two functions and use string.xml

MaximeZmt

Great Work 👍 Some comments left below

app/src/main/java/ch/sdp/vibester/database/AppPreferences.kt

app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt

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

app/src/main/java/ch/sdp/vibester/database/AppPreferences.kt

jiabaow · 2022-05-15T15:24:13Z

app/src/main/java/ch/sdp/vibester/database/AppPreferences.kt

+            it.putString(GAME_MODE, value)
+        }
+
+    var gameGenre: String?


consider re-group these two functions and use string.xml

app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt

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

app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt

app/src/main/res/layout/activity_end_solo.xml

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

codeclimate · 2022-05-15T20:10:50Z

Code Climate has analyzed commit 776c264 and detected 8 issues on this pull request.

Here's the issue category breakdown:

Category	Count
Duplication	8

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

This pull request will bring the total coverage in the repository to 82.7% (-0.7% change).

View more on Code Climate.

jiabaow

👍

kamilababayeva added 20 commits May 14, 2022 15:19

remove IncorrectSongActivity

6e0ee99

add itemview for SongListAdapter

b3ceb17

separate game_ending_screen.xml based on game mode

5b820f1

add App Preferences

0627122

GameSetupFragment: fix the mode set

b1d2647

GameSetupFragment: add shared preferences

8fd3328

remove IncorrectSongsActivityTest

88c6bc9

GameActivity: fix the intent extra for GameEndingActivity

4782097

GameEndingActivity: combine incorrect songs and game ending activity

e9f7dd0

SongListAdapter: adapter to display songs in the end of the game

f34194a

GameEndingActivityTest: fxi the tests

9bdeab3

rename return to main button id

6d14c38

GameEndingActivity: add new tests for functionality

64577e3

BuzzerScreenActivity: fix ending tests

538f17e

GameEndingActivity: fix the test

3c01749

Typing and Lyrics Game: add the preferences initi

185ef3c

ProfileActivityTest: comment the failing test

08dc2c1

AndroidManifest: remove IncorrectSongsActivity

dd2f958

BuzzerScreenActivity: remove extras

c036d39

ProfileActivityTest: remove failing test

dedbdb7

codeclimate bot reviewed May 15, 2022

View reviewed changes

kamilababayeva added 4 commits May 15, 2022 15:44

activity_end: rename the id

4733e84

SongListAdapter: update the comments

aa72ba6

GameEndingActivity: add new tests

26104ff

Change the functionality of score in the game

8eecfb3

kamilababayeva marked this pull request as ready for review May 15, 2022 14:09

kamilababayeva linked an issue May 15, 2022 that may be closed by this pull request

Correct the statistics in the ending game #295

Closed

jiabaow self-requested a review May 15, 2022 14:20

codeclimate bot reviewed May 15, 2022

View reviewed changes

MaximeZmt self-requested a review May 15, 2022 14:48

MaximeZmt approved these changes May 15, 2022

View reviewed changes

app/src/main/java/ch/sdp/vibester/database/AppPreferences.kt Outdated Show resolved Hide resolved

app/src/main/java/ch/sdp/vibester/database/AppPreferences.kt Outdated Show resolved Hide resolved

app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt Outdated Show resolved Hide resolved

jiabaow reviewed May 15, 2022

View reviewed changes

kamilababayeva added 6 commits May 15, 2022 18:23

added comments, fixed review comments

75c547e

AppPreferences: fix the typo

e4fdd4b

strings.xml: add string for preferences

b9697b5

AppPreferences: common function to set/get prefrerences

9ca9c2b

change set/get prefernces with a new function

86dfb78

ProfieActivity: comment the tsest

776c264

jiabaow approved these changes May 15, 2022

View reviewed changes

kamilababayeva merged commit d4cf128 into main May 15, 2022

kamilababayeva deleted the kamila/display_songs_endgame branch May 15, 2022 21:11

kamilababayeva self-assigned this May 16, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Kamila/display songs endgame #298

Kamila/display songs endgame #298

kamilababayeva commented May 14, 2022 •

edited

Loading

codeclimate bot May 15, 2022

codeclimate bot May 15, 2022

codeclimate bot May 15, 2022

codeclimate bot May 15, 2022

codeclimate bot May 15, 2022

codeclimate bot May 15, 2022

codeclimate bot May 15, 2022

codeclimate bot May 15, 2022

codeclimate bot May 15, 2022

codeclimate bot May 15, 2022

jiabaow May 15, 2022

kamilababayeva May 15, 2022

MaximeZmt left a comment

jiabaow May 15, 2022

codeclimate bot commented May 15, 2022

jiabaow left a comment

Kamila/display songs endgame #298

Kamila/display songs endgame #298

Conversation

kamilababayeva commented May 14, 2022 • edited Loading

codeclimate bot May 15, 2022

Choose a reason for hiding this comment

codeclimate bot May 15, 2022

Choose a reason for hiding this comment

codeclimate bot May 15, 2022

Choose a reason for hiding this comment

codeclimate bot May 15, 2022

Choose a reason for hiding this comment

codeclimate bot May 15, 2022

Choose a reason for hiding this comment

codeclimate bot May 15, 2022

Choose a reason for hiding this comment

codeclimate bot May 15, 2022

Choose a reason for hiding this comment

codeclimate bot May 15, 2022

Choose a reason for hiding this comment

codeclimate bot May 15, 2022

Choose a reason for hiding this comment

codeclimate bot May 15, 2022

Choose a reason for hiding this comment

jiabaow May 15, 2022

Choose a reason for hiding this comment

kamilababayeva May 15, 2022

Choose a reason for hiding this comment

MaximeZmt left a comment

Choose a reason for hiding this comment

jiabaow May 15, 2022

Choose a reason for hiding this comment

codeclimate bot commented May 15, 2022

jiabaow left a comment

Choose a reason for hiding this comment

kamilababayeva commented May 14, 2022 •

edited

Loading