Skip to content

Commit 0df170e

Browse files
bengelhauptbengelhaupt
committed
Fix Linting comments
1 parent 8ad0585 commit 0df170e

7 files changed

Lines changed: 49 additions & 25 deletions

File tree

‎app/src/main/java/de/xikolo/controllers/section/QuizFragment.kt‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,11 @@ class QuizFragment : ViewModelFragment<QuizViewModel>() {
146146

147147
if (quiz.allowedAttempts > 0) {
148148
allowedAttempts.text =
149-
getString(R.string.quiz_allowed_attempts, quiz.allowedAttempts)
149+
resources.getQuantityString(
150+
R.plurals.quiz_allowed_attempts,
151+
quiz.allowedAttempts,
152+
quiz.allowedAttempts
153+
)
150154
allowedAttempts.visibility = View.VISIBLE
151155
} else {
152156
allowedAttempts.visibility = View.GONE
@@ -156,7 +160,11 @@ class QuizFragment : ViewModelFragment<QuizViewModel>() {
156160

157161
viewModel.questions
158162
.observe(viewLifecycleOwner) { questions ->
159-
questionCount.text = getString(R.string.quiz_question_count, questions.size)
163+
questionCount.text = resources.getQuantityString(
164+
R.plurals.quiz_question_count,
165+
questions.size,
166+
questions.size
167+
)
160168

161169
if (questionViewMap.isEmpty()) {
162170
questionViewMap = buildQuestions(questions)
@@ -459,7 +467,8 @@ class QuizFragment : ViewModelFragment<QuizViewModel>() {
459467
val questionView = QuestionContainerView(it)
460468

461469
questionView.numberView.text = getString(R.string.quiz_question_number, n + 1)
462-
questionView.pointsView.text = getString(R.string.quiz_question_points, q.maxPoints)
470+
questionView.pointsView.text =
471+
getString(R.string.quiz_question_points, q.maxPoints.toString())
463472
questionView.questionView.setMarkdownText(q.text)
464473

465474
when (q.type) {

‎app/src/main/java/de/xikolo/views/quiz/FreeTextQuestionView.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import java.util.Locale
2121
class FreeTextQuestionView(context: Context, attributeSet: AttributeSet? = null) :
2222
FrameLayout(context, attributeSet), QuestionView {
2323

24-
@BindView(R.id.edittext)
25-
lateinit var edittext: EditText
24+
@BindView(R.id.textField)
25+
lateinit var textField: EditText
2626

2727
@BindView(R.id.indicator)
2828
lateinit var indicator: TextView
@@ -39,7 +39,7 @@ class FreeTextQuestionView(context: Context, attributeSet: AttributeSet? = null)
3939

4040
ButterKnife.bind(this)
4141

42-
edittext.onFocusChangeListener = OnFocusChangeListener { v, hasFocus ->
42+
textField.onFocusChangeListener = OnFocusChangeListener { v, hasFocus ->
4343
if (v.isEnabled && hasFocus) {
4444
changeListener
4545
}
@@ -57,11 +57,11 @@ class FreeTextQuestionView(context: Context, attributeSet: AttributeSet? = null)
5757
}
5858

5959
override fun lock() {
60-
edittext.isEnabled = false
60+
textField.isEnabled = false
6161
}
6262

6363
override fun unlock() {
64-
edittext.isEnabled = true
64+
textField.isEnabled = true
6565
}
6666

6767
override fun showSolution(answer: QuizSubmissionAnswer?) {
@@ -80,10 +80,10 @@ class FreeTextQuestionView(context: Context, attributeSet: AttributeSet? = null)
8080
}
8181

8282
override fun getAnswer(): QuizSubmissionAnswer {
83-
return QuizSubmissionAnswer("", QuizQuestion.TYPE_FREE_TEXT, edittext.text.toString())
83+
return QuizSubmissionAnswer("", QuizQuestion.TYPE_FREE_TEXT, textField.text.toString())
8484
}
8585

8686
override fun insertAnswer(answer: QuizSubmissionAnswer?) {
87-
edittext.setText(answer?.value?.data?.first())
87+
textField.setText(answer?.value?.data?.first())
8888
}
8989
}

‎app/src/main/res/layout/container_quiz_question_free_text.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:res="http://schemas.android.com/apk/res-auto"
4+
xmlns:tools="http://schemas.android.com/tools"
45
android:id="@+id/answer"
56
android:layout_width="match_parent"
67
android:layout_height="wrap_content"
@@ -12,12 +13,13 @@
1213
android:orientation="horizontal">
1314

1415
<EditText
15-
android:id="@+id/edittext"
16+
android:id="@+id/textField"
1617
android:layout_width="0dp"
1718
android:layout_height="100dp"
1819
android:layout_weight="1"
19-
android:importantForAutofill="no"
20-
android:inputType="text" />
20+
android:autofillHints=""
21+
android:inputType="text"
22+
tools:ignore="LabelFor" />
2123

2224
<de.xikolo.views.CustomFontTextView
2325
android:id="@+id/indicator"

‎app/src/main/res/layout/view_enroll_button.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
23
android:layout_width="match_parent"
34
android:layout_height="wrap_content"
4-
android:background="@color/content">
5+
android:background="@color/content"
6+
tools:ignore="Overdraw">
57

68
<View
79
android:layout_width="match_parent"

‎app/src/main/res/values-de/strings.xml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<resources>
2+
<resources xmlns:tools="http://schemas.android.com/tools">
33

44
<!-- -->
55
<string name="title_section_profile">Profil</string>
@@ -372,17 +372,23 @@
372372
<string name="course_filter_channel">Channel</string>
373373

374374
<string name="quiz_question_number">Frage %1$d</string>
375-
<string name="quiz_question_points">%1$.1f Punkte</string>
375+
<string name="quiz_question_points">%1$s Punkte</string>
376376
<string name="quiz_question_explanation_show">Erläuterung anzeigen</string>
377377
<string name="quiz_question_explanation_hide">Erläuterung ausblenden</string>
378378
<string name="quiz_selftest_description">Dieses Quiz ist ein Selbsttest. Sie können es beliebig oft wiederholen.</string>
379-
<string name="quiz_question_count">Dieses Quiz hat %1$d Fragen.</string>
379+
<plurals name="quiz_question_count">
380+
<item quantity="one">Dieses Quiz hat eine Frage.</item>
381+
<item quantity="other">Dieses Quiz hat %d Fragen.</item>
382+
</plurals>
380383
<string name="quiz_maximum_points">max %1$s Punkte</string>
381384
<string name="quiz_submission_points">Sie haben %1$s von %2$s Punkten erreicht</string>
382385
<string name="quiz_submission_submitted_at">Abgegeben: %1$s</string>
383-
<string name="quiz_time_limit">Zeitbegrenzung: %1$d Sekunden.</string>
386+
<string name="quiz_time_limit" tools:ignore="PluralsCandidate">Zeitbegrenzung: %1$d Sekunden.</string>
384387
<string name="quiz_time_limit_none">Es gibt keine Zeitbegrenzung für dieses Quiz.</string>
385-
<string name="quiz_allowed_attempts">Es sind %1$d Versuche erlaubt.</string>
388+
<plurals name="quiz_allowed_attempts">
389+
<item quantity="one">Es ist ein Versuche erlaubt.</item>
390+
<item quantity="other">Es sind %d Versuche erlaubt.</item>
391+
</plurals>
386392
<string name="quiz_snapshot_saving">Speichern…</string>
387393
<string name="quiz_snapshot_saved">Alle Änderungen gespeichert</string>
388394
<string name="quiz_snapshot_error">Fehler beim Zwischenspeichern</string>

‎app/src/main/res/values/icons.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
<string name="icon_points" translatable="false">&#xe672;</string>
4242
<string name="icon_solo" translatable="false">&#xe624;</string>
4343
<string name="icon_team" translatable="false">&#xe622;</string>
44-
<string name="icon_explanation" translatable="false">&#xe60c;</string>
4544
<string name="icon_checkmark" translatable="false">&#xe642;</string>
4645
<string name="icon_cross" translatable="false">&#xe643;</string>
4746

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<resources>
2+
<resources xmlns:tools="http://schemas.android.com/tools">
33

44
<!-- -->
55
<string name="title_section_profile">Profile</string>
@@ -374,17 +374,23 @@
374374
<string name="course_filter_channel">Channel</string>
375375

376376
<string name="quiz_question_number">Question %1$d</string>
377-
<string name="quiz_question_points">%1$.1f Pts</string>
377+
<string name="quiz_question_points">%1$s Pts</string>
378378
<string name="quiz_question_explanation_show">Show Explanation</string>
379379
<string name="quiz_question_explanation_hide">Hide Explanation</string>
380380
<string name="quiz_selftest_description">This quiz is a self-test. You can repeat it as often as you like.</string>
381-
<string name="quiz_question_count">Dieses Quiz hat %1$d Fragen.</string>
381+
<plurals name="quiz_question_count">
382+
<item quantity="one">This quiz has %d question.</item>
383+
<item quantity="other">This quiz has %d questions.</item>
384+
</plurals>
382385
<string name="quiz_maximum_points">max %1$s points</string>
383386
<string name="quiz_submission_points">%1$s of %2$s points achieved</string>
384387
<string name="quiz_submission_submitted_at">Submitted: %1$s</string>
385-
<string name="quiz_time_limit">Time limit: %1$d seconds.</string>
388+
<string name="quiz_time_limit" tools:ignore="PluralsCandidate">Time limit: %1$d seconds.</string>
386389
<string name="quiz_time_limit_none">No time limit for this quiz, enjoy!</string>
387-
<string name="quiz_allowed_attempts">%1$d attempts allowed.</string>
390+
<plurals name="quiz_allowed_attempts">
391+
<item quantity="one">%d attempt allowed.</item>
392+
<item quantity="other">%d attempts allowed.</item>
393+
</plurals>
388394
<string name="quiz_snapshot_saving">Saving…</string>
389395
<string name="quiz_snapshot_saved">All answers saved</string>
390396
<string name="quiz_snapshot_error">Error while saving</string>

0 commit comments

Comments
 (0)