Fix Linting comments

openHPI · Apr 16, 2020 · 0df170e · 0df170e
1 parent 8ad0585
commit 0df170e
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 25 deletions.
diff --git a/app/src/main/java/de/xikolo/controllers/section/QuizFragment.kt b/app/src/main/java/de/xikolo/controllers/section/QuizFragment.kt
@@ -146,7 +146,11 @@ class QuizFragment : ViewModelFragment<QuizViewModel>() {
 
                     if (quiz.allowedAttempts > 0) {
                         allowedAttempts.text =
-                            getString(R.string.quiz_allowed_attempts, quiz.allowedAttempts)
+                            resources.getQuantityString(
+                                R.plurals.quiz_allowed_attempts,
+                                quiz.allowedAttempts,
+                                quiz.allowedAttempts
+                            )
                         allowedAttempts.visibility = View.VISIBLE
                     } else {
                         allowedAttempts.visibility = View.GONE
@@ -156,7 +160,11 @@ class QuizFragment : ViewModelFragment<QuizViewModel>() {
 
         viewModel.questions
             .observe(viewLifecycleOwner) { questions ->
-                questionCount.text = getString(R.string.quiz_question_count, questions.size)
+                questionCount.text = resources.getQuantityString(
+                    R.plurals.quiz_question_count,
+                    questions.size,
+                    questions.size
+                )
 
                 if (questionViewMap.isEmpty()) {
                     questionViewMap = buildQuestions(questions)
@@ -459,7 +467,8 @@ class QuizFragment : ViewModelFragment<QuizViewModel>() {
                 val questionView = QuestionContainerView(it)
 
                 questionView.numberView.text = getString(R.string.quiz_question_number, n + 1)
-                questionView.pointsView.text = getString(R.string.quiz_question_points, q.maxPoints)
+                questionView.pointsView.text =
+                    getString(R.string.quiz_question_points, q.maxPoints.toString())
                 questionView.questionView.setMarkdownText(q.text)
 
                 when (q.type) {

diff --git a/app/src/main/java/de/xikolo/views/quiz/FreeTextQuestionView.kt b/app/src/main/java/de/xikolo/views/quiz/FreeTextQuestionView.kt
@@ -21,8 +21,8 @@ import java.util.Locale
 class FreeTextQuestionView(context: Context, attributeSet: AttributeSet? = null) :
     FrameLayout(context, attributeSet), QuestionView {
 
-    @BindView(R.id.edittext)
-    lateinit var edittext: EditText
+    @BindView(R.id.textField)
+    lateinit var textField: EditText
 
     @BindView(R.id.indicator)
     lateinit var indicator: TextView
@@ -39,7 +39,7 @@ class FreeTextQuestionView(context: Context, attributeSet: AttributeSet? = null)
 
         ButterKnife.bind(this)
 
-        edittext.onFocusChangeListener = OnFocusChangeListener { v, hasFocus ->
+        textField.onFocusChangeListener = OnFocusChangeListener { v, hasFocus ->
             if (v.isEnabled && hasFocus) {
                 changeListener
             }
@@ -57,11 +57,11 @@ class FreeTextQuestionView(context: Context, attributeSet: AttributeSet? = null)
     }
 
     override fun lock() {
-        edittext.isEnabled = false
+        textField.isEnabled = false
     }
 
     override fun unlock() {
-        edittext.isEnabled = true
+        textField.isEnabled = true
     }
 
     override fun showSolution(answer: QuizSubmissionAnswer?) {
@@ -80,10 +80,10 @@ class FreeTextQuestionView(context: Context, attributeSet: AttributeSet? = null)
     }
 
     override fun getAnswer(): QuizSubmissionAnswer {
-        return QuizSubmissionAnswer("", QuizQuestion.TYPE_FREE_TEXT, edittext.text.toString())
+        return QuizSubmissionAnswer("", QuizQuestion.TYPE_FREE_TEXT, textField.text.toString())
     }
 
     override fun insertAnswer(answer: QuizSubmissionAnswer?) {
-        edittext.setText(answer?.value?.data?.first())
+        textField.setText(answer?.value?.data?.first())
     }
 }
diff --git a/app/src/main/res/layout/container_quiz_question_free_text.xml b/app/src/main/res/layout/container_quiz_question_free_text.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:res="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/answer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -12,12 +13,13 @@
         android:orientation="horizontal">
 
         <EditText
-            android:id="@+id/edittext"
+            android:id="@+id/textField"
             android:layout_width="0dp"
             android:layout_height="100dp"
             android:layout_weight="1"
-            android:importantForAutofill="no"
-            android:inputType="text" />
+            android:autofillHints=""
+            android:inputType="text"
+            tools:ignore="LabelFor" />
 
         <de.xikolo.views.CustomFontTextView
             android:id="@+id/indicator"

diff --git a/app/src/main/res/layout/view_enroll_button.xml b/app/src/main/res/layout/view_enroll_button.xml
@@ -1,7 +1,9 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/content">
+    android:background="@color/content"
+    tools:ignore="Overdraw">
 
     <View
         android:layout_width="match_parent"

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- -->
     <string name="title_section_profile">Profil</string>
@@ -372,17 +372,23 @@
     <string name="course_filter_channel">Channel</string>
 
     <string name="quiz_question_number">Frage %1$d</string>
-    <string name="quiz_question_points">%1$.1f Punkte</string>
+    <string name="quiz_question_points">%1$s Punkte</string>
     <string name="quiz_question_explanation_show">Erläuterung anzeigen</string>
     <string name="quiz_question_explanation_hide">Erläuterung ausblenden</string>
     <string name="quiz_selftest_description">Dieses Quiz ist ein Selbsttest. Sie können es beliebig oft wiederholen.</string>
-    <string name="quiz_question_count">Dieses Quiz hat %1$d Fragen.</string>
+    <plurals name="quiz_question_count">
+        <item quantity="one">Dieses Quiz hat eine Frage.</item>
+        <item quantity="other">Dieses Quiz hat %d Fragen.</item>
+    </plurals>
     <string name="quiz_maximum_points">max %1$s Punkte</string>
     <string name="quiz_submission_points">Sie haben %1$s von %2$s Punkten erreicht</string>
     <string name="quiz_submission_submitted_at">Abgegeben: %1$s</string>
-    <string name="quiz_time_limit">Zeitbegrenzung: %1$d Sekunden.</string>
+    <string name="quiz_time_limit" tools:ignore="PluralsCandidate">Zeitbegrenzung: %1$d Sekunden.</string>
     <string name="quiz_time_limit_none">Es gibt keine Zeitbegrenzung für dieses Quiz.</string>
-    <string name="quiz_allowed_attempts">Es sind %1$d Versuche erlaubt.</string>
+    <plurals name="quiz_allowed_attempts">
+        <item quantity="one">Es ist ein Versuche erlaubt.</item>
+        <item quantity="other">Es sind %d Versuche erlaubt.</item>
+    </plurals>
     <string name="quiz_snapshot_saving">Speichern…</string>
     <string name="quiz_snapshot_saved">Alle Änderungen gespeichert</string>
     <string name="quiz_snapshot_error">Fehler beim Zwischenspeichern</string>

diff --git a/app/src/main/res/values/icons.xml b/app/src/main/res/values/icons.xml
@@ -41,7 +41,6 @@
     <string name="icon_points" translatable="false">&#xe672;</string>
     <string name="icon_solo" translatable="false">&#xe624;</string>
     <string name="icon_team" translatable="false">&#xe622;</string>
-    <string name="icon_explanation" translatable="false">&#xe60c;</string>
     <string name="icon_checkmark" translatable="false">&#xe642;</string>
     <string name="icon_cross" translatable="false">&#xe643;</string>
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- -->
     <string name="title_section_profile">Profile</string>
@@ -374,17 +374,23 @@
     <string name="course_filter_channel">Channel</string>
 
     <string name="quiz_question_number">Question %1$d</string>
-    <string name="quiz_question_points">%1$.1f Pts</string>
+    <string name="quiz_question_points">%1$s Pts</string>
     <string name="quiz_question_explanation_show">Show Explanation</string>
     <string name="quiz_question_explanation_hide">Hide Explanation</string>
     <string name="quiz_selftest_description">This quiz is a self-test. You can repeat it as often as you like.</string>
-    <string name="quiz_question_count">Dieses Quiz hat %1$d Fragen.</string>
+    <plurals name="quiz_question_count">
+        <item quantity="one">This quiz has %d question.</item>
+        <item quantity="other">This quiz has %d questions.</item>
+    </plurals>
     <string name="quiz_maximum_points">max %1$s points</string>
     <string name="quiz_submission_points">%1$s of %2$s points achieved</string>
     <string name="quiz_submission_submitted_at">Submitted: %1$s</string>
-    <string name="quiz_time_limit">Time limit: %1$d seconds.</string>
+    <string name="quiz_time_limit" tools:ignore="PluralsCandidate">Time limit: %1$d seconds.</string>
     <string name="quiz_time_limit_none">No time limit for this quiz, enjoy!</string>
-    <string name="quiz_allowed_attempts">%1$d attempts allowed.</string>
+    <plurals name="quiz_allowed_attempts">
+        <item quantity="one">%d attempt allowed.</item>
+        <item quantity="other">%d attempts allowed.</item>
+    </plurals>
     <string name="quiz_snapshot_saving">Saving…</string>
     <string name="quiz_snapshot_saved">All answers saved</string>
     <string name="quiz_snapshot_error">Error while saving</string>