This repository has been archived by the owner on Jan 31, 2024. It is now read-only.
Margaux/name check #152
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
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -23,6 +23,7 @@ class BuzzerScreenActivity : AppCompatActivity() { | |||||
| private val buzzersToRows:HashMap<Int, Int> = initHashmap() | ||||||
| private val rowsIdArray = ArrayList(buzzersToRows.values) | ||||||
| private val buzIds = ArrayList(buzzersToRows.keys) | ||||||
| private var winnerId = -1 // same function as the winnerId in the updater. Ugly placeholder solution for now | ||||||
|
|
||||||
| private fun initHashmap(): HashMap<Int, Int> { | ||||||
| val buzzersToRows:HashMap<Int, Int> = hashMapOf() | ||||||
|
|
@@ -144,13 +145,15 @@ class BuzzerScreenActivity : AppCompatActivity() { | |||||
| private fun setAnswerButton(answer: LinearLayout, button: Button, updater: BuzzerScoreUpdater, map: Map<Int, Int>) { | ||||||
|
There was a problem hiding this comment. map is buzzersToRows in this function. BuzzersToRows is global in BuzzerScreenActivity class, so it is accessible in this function without passing it as a parameter. Do you think it is better if we remove map from here as a parameter and will access buzzerToRows inside the function? |
||||||
| button.setOnClickListener { | ||||||
| answer.visibility = android.view.View.INVISIBLE | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| if (pressedBuzzer >= 0) { | ||||||
| if(button.id==R.id.buttonCorrect) { | ||||||
| updater.updateScoresArray(pressedBuzzer, 1) | ||||||
| winnerId = updater.getWinnerId() | ||||||
| } else {updater.updateScoresArray(pressedBuzzer, -1)} | ||||||
| val view = map[pressedBuzzer]?.let { it1 -> findViewById<TextView>(it1) } | ||||||
| if (view != null && updater.getMap().keys.contains(pressedBuzzer)) {view.text=updater.getMap()[pressedBuzzer].toString()} | ||||||
| } | ||||||
|
There was a problem hiding this comment. Is this piece of code hard to test? You assign listener in onCreate, so if you do button.preform.click(), this code should be testable, no? |
||||||
|
|
||||||
| } | ||||||
| setPressed(NO_BUZZER_PRESSED) // reset the buzzer | ||||||
| } | ||||||
|
|
@@ -170,6 +173,8 @@ class BuzzerScreenActivity : AppCompatActivity() { | |||||
| intent.putExtra("playerName", "Arda") | ||||||
| intent.putExtra("nbIncorrectSong", 3) | ||||||
|
|
||||||
| intent.putExtra("Winner Name", if (winnerId>0) {findViewById<Button>(winnerId).text} else {null}) | ||||||
|
|
||||||
| intent.putStringArrayListExtra("str_arr_inc", incArray) | ||||||
| intent.putStringArrayListExtra("str_arr_name", statNames) | ||||||
| intent.putStringArrayListExtra("str_arr_val", statVal) | ||||||
|
|
||||||
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 |
|---|---|---|
|
|
@@ -27,6 +27,11 @@ class BuzzerSetupActivity : AppCompatActivity(), AdapterView.OnItemSelectedListe | |
| ) | ||
| adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||
| spinner.onItemSelectedListener = this | ||
|
|
||
| findViewById<Button>(R.id.missingNameOk).setOnClickListener { | ||
| findViewById<LinearLayout>(R.id.missingNameAlert).visibility=View.INVISIBLE | ||
| findViewById<Button>(R.id.nb_players_selected).visibility=View.VISIBLE | ||
| } | ||
| } | ||
|
|
||
| override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) { | ||
|
|
@@ -66,7 +71,7 @@ class BuzzerSetupActivity : AppCompatActivity(), AdapterView.OnItemSelectedListe | |
| else -> 0 | ||
| } | ||
| findViewById<EditText>(id).visibility = | ||
| if (n >= i) View.VISIBLE else View.INVISIBLE | ||
| } | ||
|
|
||
| override fun onNothingSelected(parent: AdapterView<*>) {text = "One"} | ||
|
|
@@ -86,7 +91,11 @@ class BuzzerSetupActivity : AppCompatActivity(), AdapterView.OnItemSelectedListe | |
| arrayOf(R.id.namePlayer1, R.id.namePlayer2, R.id.namePlayer3, R.id.namePlayer4) | ||
| var i = 0 | ||
| for (playerView in players) { | ||
| val name = findViewById<EditText>(editTextIdArray[i]).text.toString() | ||
| if (name.isNotEmpty()) { pNameArray[i] = name } else { | ||
|
There was a problem hiding this comment. is there a particular reason why the if-else is formatted like this? There was a problem hiding this comment. It was to remain under 25 lines of code for the function for the CodeClimate check 😅 There was a problem hiding this comment. ah okkkk, in this case, create a separate function then make a call to it would be a solution too |
||
| findViewById<LinearLayout>(R.id.missingNameAlert).visibility=View.VISIBLE | ||
| findViewById<Button>(R.id.nb_players_selected).visibility=View.INVISIBLE | ||
| return } | ||
| i += 1 | ||
| } | ||
| intent.putExtra("Player Names", pNameArray) | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -40,6 +40,15 @@ class GameEndingActivity : AppCompatActivity() { | |
|
|
||
| setContentView(R.layout.activity_game_ending_screen) | ||
|
|
||
| if (intent.hasExtra("Winner Name")) { | ||
| val winner = intent.getStringExtra("Winner Name") | ||
| /* | ||
| if (winner!=null) { | ||
|
There was a problem hiding this comment. I would suggest either removing the commented code or adding a fixme explanation |
||
| findViewById<TextView>(R.id.winnerText).text="And the winner is... $winner!" | ||
| } else {findViewById<TextView>(R.id.winnerText).text="Nobody won this game!"} | ||
| */ | ||
| } | ||
|
|
||
| if (intent.hasExtra("playerName")) { | ||
| playerName = intent.getStringExtra("playerName") | ||
| } | ||
|
|
@@ -89,8 +98,11 @@ class GameEndingActivity : AppCompatActivity() { | |
| val statPlayerText = "Here are the stats for the player $playerName" | ||
| playerNameView.text = statPlayerText | ||
| } | ||
| /* | ||
| fun hideWinnerPanel(view: View) { | ||
| findViewById<TextView>(R.id.winnerPanel).visibility=View.INVISIBLE | ||
|
|
||
| } | ||
| */ | ||
| fun goToIncorrectlyGuessedSongs(view: View) { | ||
| val intent = Intent(this, IncorrectSongsActivity::class.java) | ||
| intent.putExtra("nb_false", nbIncorrectSongs) | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -23,17 +23,31 @@ | |
|
|
||
| </LinearLayout> | ||
|
|
||
| <TableLayout | ||
| android:id="@+id/scoresTable" | ||
| android:layout_width="0dp" | ||
| android:layout_height="0dp" | ||
| android:layout_marginTop="1dp" | ||
| android:layout_marginBottom="114dp" | ||
| android:gravity="center" | ||
| app:layout_constraintBottom_toTopOf="@+id/answer" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent"> | ||
|
|
||
| </TableLayout> | ||
|
|
||
| <LinearLayout | ||
| android:id="@+id/answer" | ||
| android:layout_width="0dp" | ||
| android:layout_height="0dp" | ||
| android:layout_marginStart="30dp" | ||
| android:layout_marginEnd="30dp" | ||
| android:layout_marginBottom="116dp" | ||
| android:background="#AAAAAA" | ||
| android:gravity="center" | ||
| android:orientation="vertical" | ||
| android:visibility="invisible" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
|
|
@@ -49,50 +63,36 @@ | |
| android:id="@+id/buttonCorrect" | ||
| android:layout_width="125dp" | ||
| android:layout_height="40dp" | ||
| android:backgroundTint="@color/cg_blue" | ||
| android:elevation="10dp" | ||
| android:gravity="center" | ||
| android:stateListAnimator="@null" | ||
| android:text="@string/correct" | ||
| android:translationZ="10dp" /> | ||
|
|
||
| <Button | ||
| android:id="@+id/buttonWrong" | ||
| android:layout_width="125dp" | ||
| android:layout_height="40dp" | ||
| android:backgroundTint="@color/cg_blue" | ||
| android:elevation="10dp" | ||
| android:gravity="center" | ||
| android:stateListAnimator="@null" | ||
| android:text="@string/wrong" | ||
| android:translationZ="10dp" /> | ||
|
|
||
| </LinearLayout> | ||
|
|
||
| <Button | ||
| android:id="@+id/go_to_end" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:backgroundTint="@color/cg_blue" | ||
| android:elevation="10dp" | ||
| android:onClick="switchToEnding" | ||
| android:stateListAnimator="@null" | ||
| android:text="@string/go_to_end" | ||
| android:translationZ="10dp" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@+id/scoresTable" /> | ||
|
|
||
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.
maybe move the onView... to a new line for better readability