Skip to content

likorn / quick_max

Go to a project
Commit 0bd68e10 by likorn
Options

Some refactoring

parent fc50e836
Inline Side-by-side
Showing with 31 additions and 28 deletions
app/src/androidTest/java/com/example/quickmax/MainActivityTest.kt
...@@ -25,10 +25,10 @@ class MainActivityTest { ...@@ -25,10 +25,10 @@ class MainActivityTest {
@Before @Before
fun init() { fun init() {
answers = mapOf( answers = mapOf(
getText(withId(R.id.btn_left_top)).toInt() to R.id.btn_left_top, getText(withId(R.id.card_left_top)).toInt() to R.id.card_left_top,
getText(withId(R.id.btn_right_top)).toInt() to R.id.btn_right_top, getText(withId(R.id.card_right_top)).toInt() to R.id.card_right_top,
getText(withId(R.id.btn_left_bottom)).toInt() to R.id.btn_left_bottom, getText(withId(R.id.card_left_bottom)).toInt() to R.id.card_left_bottom,
getText(withId(R.id.btn_right_bottom)).toInt() to R.id.btn_right_bottom getText(withId(R.id.card_right_bottom)).toInt() to R.id.card_right_bottom
) )
} }
...@@ -50,9 +50,9 @@ class MainActivityTest { ...@@ -50,9 +50,9 @@ class MainActivityTest {
@Test @Test
fun only_fist_answer_accepted() { fun only_fist_answer_accepted() {
onView(withId(R.id.btn_right_bottom)).perform(click()) onView(withId(R.id.card_right_bottom)).perform(click())
assertTrue(testRule.activity.supportFragmentManager.fragments.size == 1) assertTrue(testRule.activity.supportFragmentManager.fragments.size == 1)
onView(withId(R.id.btn_left_bottom)).perform(click()) onView(withId(R.id.card_left_bottom)).perform(click())
assertTrue(testRule.activity.supportFragmentManager.fragments.size == 1) assertTrue(testRule.activity.supportFragmentManager.fragments.size == 1)
} }
......
app/src/main/java/com/example/quickmax/AnswerSet.kt
...@@ -3,7 +3,7 @@ package com.example.quickmax ...@@ -3,7 +3,7 @@ package com.example.quickmax
class AnswerSet(numDigits: Int): Iterable<Answer> { class AnswerSet(numDigits: Int): Iterable<Answer> {
private val buttonIds = listOf(R.id.btn_left_top, R.id.btn_right_top, R.id.btn_left_bottom, R.id.btn_right_bottom) private val buttonIds = listOf(R.id.card_left_top, R.id.card_right_top, R.id.card_left_bottom, R.id.card_right_bottom)
private val numAnswers = 4 private val numAnswers = 4
private lateinit var correctAnswer: Answer private lateinit var correctAnswer: Answer
......
app/src/main/res/layout/activity_main.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
android:id="@+id/main_layout" android:id="@+id/main_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#C4BFCC" android:background="@color/colorBackground"
tools:context=".MainActivity"> tools:context=".MainActivity">
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
android:gravity="center" android:gravity="center"
android:includeFontPadding="true" android:includeFontPadding="true"
android:text="@string/second_max" android:text="@string/second_max"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="#323753" /> android:textColor="#323753" />
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
...@@ -56,52 +56,52 @@ ...@@ -56,52 +56,52 @@
app:layout_constraintVertical_chainStyle="packed"> app:layout_constraintVertical_chainStyle="packed">
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/btn_left_top" android:id="@+id/card_left_top"
style="@style/AnswerCard" style="@style/AnswerCard"
app:layout_constraintBottom_toTopOf="@+id/btn_left_bottom" app:layout_constraintBottom_toTopOf="@+id/card_left_bottom"
app:layout_constraintEnd_toStartOf="@+id/btn_right_top" app:layout_constraintEnd_toStartOf="@+id/card_right_top"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" > app:layout_constraintTop_toTopOf="parent">
<TextView style="@style/AnswerCardText"/> <TextView style="@style/AnswerCardText" />
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/btn_right_top" android:id="@+id/card_right_top"
style="@style/AnswerCard" style="@style/AnswerCard"
app:layout_constraintBottom_toTopOf="@id/btn_right_bottom" app:layout_constraintBottom_toTopOf="@id/card_right_bottom"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/btn_left_top" app:layout_constraintStart_toEndOf="@+id/card_left_top"
app:layout_constraintTop_toTopOf="parent" > app:layout_constraintTop_toTopOf="parent">
<TextView style="@style/AnswerCardText"/> <TextView style="@style/AnswerCardText" />
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/btn_left_bottom" android:id="@+id/card_left_bottom"
style="@style/AnswerCard" style="@style/AnswerCard"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/btn_right_bottom" app:layout_constraintEnd_toStartOf="@+id/card_right_bottom"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/btn_left_top" > app:layout_constraintTop_toBottomOf="@+id/card_left_top">
<TextView style="@style/AnswerCardText"/> <TextView style="@style/AnswerCardText" />
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/btn_right_bottom" android:id="@+id/card_right_bottom"
style="@style/AnswerCard" style="@style/AnswerCard"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/btn_left_bottom" app:layout_constraintStart_toEndOf="@+id/card_left_bottom"
app:layout_constraintTop_toBottomOf="@+id/btn_right_top" > app:layout_constraintTop_toBottomOf="@+id/card_right_top">
<TextView style="@style/AnswerCardText" /> <TextView style="@style/AnswerCardText" />
......
app/src/main/res/layout/fragment_response.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/response_layout" android:id="@+id/response_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="120dp" android:layout_height="80dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
......
app/src/main/res/layout/fragment_time_is_over.xml
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/response_layout" android:id="@+id/response_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="120dp" android:layout_height="80dp"
android:background="#F44336" android:background="#F44336"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
......
app/src/main/res/values/colors.xml
...@@ -3,4 +3,7 @@ ...@@ -3,4 +3,7 @@
<color name="colorPrimary">#008577</color> <color name="colorPrimary">#008577</color>
<color name="colorPrimaryDark">#00574B</color> <color name="colorPrimaryDark">#00574B</color>
<color name="colorAccent">#D81B60</color> <color name="colorAccent">#D81B60</color>
<color name="colorBackground">#C4BFCC</color>
<color name="colorCorrect">#81C784</color>
</resources> </resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment