Skip to content

Commit f4b9cde

Browse files
committed
Add string format and level textview to MainMenu
1 parent d597585 commit f4b9cde

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

app/src/main/java/com/tiansirk/countryquiz/ui/MainMenuFragment.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import android.view.View;
1313
import android.view.ViewGroup;
1414

15+
import com.tiansirk.countryquiz.R;
1516
import com.tiansirk.countryquiz.databinding.FragmentMainMenuBinding;
1617
import com.tiansirk.countryquiz.model.Level;
1718
import com.tiansirk.countryquiz.model.Question;
@@ -97,7 +98,8 @@ public void onDetach() {
9798
/** This method will set the data in member fields to the views */
9899
private void setDataToViews(){
99100
binding.tvName.setText(mUser.getUsername());
100-
binding.tvHighScore.setText(mUser.getTotalPoints());
101+
binding.tvLevel.setText(String.format(getString(R.string.level_main_menu_fragment), mUser.getCompletedLevels().size()));
102+
binding.tvHighScore.setText(String.format(getString(R.string.high_score_main_menu_fragment), mUser.getTotalPoints()));
101103
}
102104

103105
/** This method will show the progressbar */

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,27 @@
5555
app:layout_constraintStart_toStartOf="parent"
5656
app:layout_constraintTop_toBottomOf="@+id/tv_title" />
5757

58+
<TextView
59+
android:id="@+id/tv_level"
60+
android:layout_width="wrap_content"
61+
android:layout_height="wrap_content"
62+
tools:text="@string/level_main_menu_fragment"
63+
app:layout_constraintBottom_toTopOf="@+id/tv_high_score"
64+
app:layout_constraintEnd_toEndOf="parent"
65+
app:layout_constraintHorizontal_bias="0.5"
66+
app:layout_constraintStart_toStartOf="parent"
67+
app:layout_constraintTop_toBottomOf="@+id/tv_name" />
68+
5869
<TextView
5970
android:id="@+id/tv_high_score"
6071
android:layout_width="wrap_content"
6172
android:layout_height="wrap_content"
6273
tools:text="@string/high_score_main_menu_fragment"
63-
6474
app:layout_constraintBottom_toTopOf="@+id/btn_new_game"
6575
app:layout_constraintEnd_toEndOf="parent"
6676
app:layout_constraintHorizontal_bias="0.5"
6777
app:layout_constraintStart_toStartOf="parent"
68-
app:layout_constraintTop_toBottomOf="@+id/tv_name" />
78+
app:layout_constraintTop_toBottomOf="@+id/tv_level" />
6979
</androidx.constraintlayout.widget.ConstraintLayout>
7080
<ProgressBar
7181
android:id="@+id/pb_main_menu_fragment"

app/src/main/res/values/strings.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
<string name="welcome_fragment_2">Loading data may take a few seconds. Please wait.</string>
1616
<!-- MainMenuFragment -->
1717
<string name="title_main_menu_fragment">Country Quiz</string>
18-
<string name="high_score_main_menu_fragment">High Score: %d</string>
18+
<string name="high_score_main_menu_fragment">High score: %d</string>
19+
<string name="level_main_menu_fragment">Level %d</string>
1920
<string name="name_main_menu_fragment">Player 1</string>
2021
<string name="start_main_menu_fragment">Start Game</string>
2122
<string name="continue_main_menu_fragment">Continue Game</string>
@@ -49,4 +50,5 @@
4950
<string name="firebase_status_fmt">Firebase UID: %s</string>
5051
<string name="emailpassword_status_fmt">Email User: %1$s (verified: %2$b)</string>
5152

53+
5254
</resources>

0 commit comments

Comments
 (0)