From 6c2bb0721496dba76b879f6293358cb5252e4e3f Mon Sep 17 00:00:00 2001 From: jiabaow Date: Tue, 3 May 2022 10:21:00 +0200 Subject: [PATCH 1/3] fix scoreboard truncated items --- .../vibester/activity/ScoreBoardActivity.kt | 3 +- .../layout/scoreboard_content_scrolling.xml | 6 ++- .../res/layout/scoreboard_item_player.xml | 2 +- .../main/res/layout/scoreboard_scoreboard.xml | 47 ++++++++----------- app/src/main/res/values/colors.xml | 2 +- 5 files changed, 28 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/ch/sdp/vibester/activity/ScoreBoardActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ScoreBoardActivity.kt index 9abf9dea0..2798568c3 100644 --- a/app/src/main/java/ch/sdp/vibester/activity/ScoreBoardActivity.kt +++ b/app/src/main/java/ch/sdp/vibester/activity/ScoreBoardActivity.kt @@ -8,6 +8,7 @@ import android.view.View.GONE import android.view.View.VISIBLE import androidx.appcompat.app.AppCompatActivity import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.widget.NestedScrollView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import ch.sdp.vibester.R @@ -48,7 +49,7 @@ class ScoreBoardActivity : AppCompatActivity() { } findViewById(R.id.genrePerScoreboard).visibility = GONE - findViewById(R.id.scoreboard).visibility = VISIBLE + findViewById(R.id.scoreboard_content_scrolling).visibility = VISIBLE loadPlayersSortedBy(sortedBy) } diff --git a/app/src/main/res/layout/scoreboard_content_scrolling.xml b/app/src/main/res/layout/scoreboard_content_scrolling.xml index 6a0d48767..04b3a8c0b 100644 --- a/app/src/main/res/layout/scoreboard_content_scrolling.xml +++ b/app/src/main/res/layout/scoreboard_content_scrolling.xml @@ -2,9 +2,11 @@ + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/scoreboard_item_player.xml b/app/src/main/res/layout/scoreboard_item_player.xml index cafe7a7eb..2f5034f3e 100644 --- a/app/src/main/res/layout/scoreboard_item_player.xml +++ b/app/src/main/res/layout/scoreboard_item_player.xml @@ -65,7 +65,7 @@ android:layout_height="wrap_content" android:textSize="30sp" android:textStyle="bold" - android:textColor="@color/colorBtpn" + android:textColor="@color/colorBtn" tools:text="54" /> diff --git a/app/src/main/res/layout/scoreboard_scoreboard.xml b/app/src/main/res/layout/scoreboard_scoreboard.xml index 3738d9893..1d23e4c48 100644 --- a/app/src/main/res/layout/scoreboard_scoreboard.xml +++ b/app/src/main/res/layout/scoreboard_scoreboard.xml @@ -4,42 +4,35 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + android:layout_height="wrap_content" + app:layout_constraintTop_toTopOf="parent"> - + android:layout_height="?attr/actionBarSize" + app:layout_collapseMode="none" + app:popupTheme="@style/AppTheme.PopupOverlay"> - + android:layout_height="wrap_content" + android:text="@string/scoreboard" + android:textAlignment="center" + android:textColor="#ffffff" + android:textSize="18sp" + android:textStyle="bold" /> - + - + - + - - + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index a7e3f8998..bce4bd7b6 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -11,7 +11,7 @@ #b66119 #FF4081 #FF000000 - #f58220 + #f58220 #FF039BE5 #FF01579B #FF40C4FF From 63942715fda4ce5052a30eab728fab7112abba37 Mon Sep 17 00:00:00 2001 From: jiabaow Date: Tue, 3 May 2022 10:26:18 +0200 Subject: [PATCH 2/3] update test --- .../activity/ScoreBoardActivityTest.kt | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ScoreBoardActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ScoreBoardActivityTest.kt index cb0fadd21..5915ee4be 100644 --- a/app/src/androidTest/java/ch/sdp/vibester/activity/ScoreBoardActivityTest.kt +++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ScoreBoardActivityTest.kt @@ -46,22 +46,20 @@ class ScoreBoardActivityTest { @Test fun rockBtnShouldSetUpRecycleView() { onView(withId(R.id.rockButton)).perform(click()) - onView(withId(R.id.scoreboard)).check(matches(isDisplayed())) + onView(withId(R.id.scoreboard_content_scrolling)).check(matches(isDisplayed())) } -//TODO fix this test + @Test + fun rockBtnShouldEnableRecycleViewClick() { + onView(withId(R.id.rockButton)).perform(click()) -// @Test -// fun rockBtnShouldEnableRecycleViewClick() { -// onView(withId(R.id.rockButton)).perform(click()) -// -// onView((withId(R.id.scoreboard))) -// .perform( -// RecyclerViewActions.actionOnItemAtPosition( -// 2, click() -// ) -// ) -// } + onView((withId(R.id.recycler_view))) + .perform( + RecyclerViewActions.actionOnItemAtPosition( + 2, click() + ) + ) + } @Test fun topBtnClick() { From 9239d66b5e975c1299ac3ae889a6b783bc260585 Mon Sep 17 00:00:00 2001 From: jiabaow Date: Tue, 3 May 2022 11:24:17 +0200 Subject: [PATCH 3/3] change background color --- app/src/main/res/layout/genre_for_scoreboard.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/genre_for_scoreboard.xml b/app/src/main/res/layout/genre_for_scoreboard.xml index e9328ef4b..82a5c11f4 100644 --- a/app/src/main/res/layout/genre_for_scoreboard.xml +++ b/app/src/main/res/layout/genre_for_scoreboard.xml @@ -7,7 +7,8 @@ + android:layout_height="match_parent" + android:background="@color/floral_white">