diff --git a/.idea/misc.xml b/.idea/misc.xml index aca2867e904465201ab241ccade1de022746b512..09a8a8301accbc948023e63d6b8b316d2aa8ecf5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -10,6 +10,7 @@ <entry key="..\:/Users/csehv/AndroidStudioProjects/Kikerdezo/app/src/main/res/layout/activity_main.xml" value="0.19899103139013452" /> <entry key="..\:/Users/csehv/AndroidStudioProjects/Kikerdezo/app/src/main/res/layout/activity_question.xml" value="0.33" /> <entry key="..\:/Users/csehv/AndroidStudioProjects/Kikerdezo/app/src/main/res/layout/activity_question_list.xml" value="0.33" /> + <entry key="..\:/Users/csehv/AndroidStudioProjects/Kikerdezo/app/src/main/res/layout/activity_results.xml" value="0.27239583333333334" /> <entry key="..\:/Users/csehv/AndroidStudioProjects/Kikerdezo/app/src/main/res/layout/activity_user_name.xml" value="0.25" /> <entry key="..\:/Users/csehv/AndroidStudioProjects/Kikerdezo/app/src/main/res/layout/header_navigation_drawer.xml" value="0.20260416666666667" /> <entry key="..\:/Users/csehv/AndroidStudioProjects/Kikerdezo/app/src/main/res/layout/question_item.xml" value="0.33" /> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b1124bd5ef20e0ba4cabee73d5761e15311ed8be..83b713f9e9d7a3957587ff6569fda7acb7b1ebc2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,18 +18,22 @@ tools:targetApi="m"> <activity android:name=".ResultsActivity" - android:exported="false" /> + android:exported="false" + android:screenOrientation="portrait"/> <activity android:name=".UserName" - android:exported="false"></activity> + android:exported="false" + android:screenOrientation="portrait"></activity> <activity android:name=".QuestionListActivity" android:exported="false" android:label="@string/title_activity_question" - android:theme="@style/Theme.Kikerdezo.NoActionBar" /> + android:theme="@style/Theme.Kikerdezo.NoActionBar" + android:screenOrientation="portrait"/> <activity android:name=".MainActivity" - android:exported="true"> + android:exported="true" + android:screenOrientation="portrait"> <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/app/src/main/java/hu/bme/kszk/kikerdezo/QuestionListActivity.kt b/app/src/main/java/hu/bme/kszk/kikerdezo/QuestionListActivity.kt index f85ce2505f0383f751c8aefff519d79d0c07d54d..d2c90b369acdd9d23d6b69a6449112205cc87b3a 100644 --- a/app/src/main/java/hu/bme/kszk/kikerdezo/QuestionListActivity.kt +++ b/app/src/main/java/hu/bme/kszk/kikerdezo/QuestionListActivity.kt @@ -80,7 +80,7 @@ class QuestionListActivity : AppCompatActivity() { rvMain.adapter = questionAdapter AppDatabase.getInstanceQuestion(this@QuestionListActivity).questionDao().getLabQuestion(b).observe(this, { questions -> - questionAdapter.submitList(questions) + questionAdapter.submitList(questions.shuffled().take(10)) //Nem hittem volna, hogy ennyire konnyu megoldani a random-ot es az elso x elemet XXD }) } diff --git a/app/src/main/res/layout/activity_results.xml b/app/src/main/res/layout/activity_results.xml index 6e94650998b1811d6ccf6a69ebf042ea680f3da3..91b92481aee1b36dc8e72d79bfa3afcdaaeefce8 100644 --- a/app/src/main/res/layout/activity_results.xml +++ b/app/src/main/res/layout/activity_results.xml @@ -57,6 +57,33 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="30sp" + android:orientation="horizontal"> + + <TextView + android:layout_width="90sp" + android:layout_height="100sp" + android:text="@string/max_pont" /> + + <TextView + android:layout_width="80sp" + android:layout_height="100sp" + android:text="@string/nev" /> + + <TextView + android:layout_width="50sp" + android:layout_height="100sp" + android:text="@string/labor"/> + + <TextView + android:layout_width="0dp" + android:layout_height="100sp" + android:layout_weight="1" + android:text="@string/datum" /> + + </LinearLayout> <androidx.recyclerview.widget.RecyclerView android:id="@+id/rvResults" diff --git a/app/src/main/res/layout/question_item.xml b/app/src/main/res/layout/question_item.xml index d0dcc715457328f65c16231286b80a1de6c495d8..4e43cd36fedd947dd6ff5753cc08bd130c4a15fc 100644 --- a/app/src/main/res/layout/question_item.xml +++ b/app/src/main/res/layout/question_item.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="wrap_content"> <TextView android:id="@+id/question" @@ -17,7 +17,8 @@ app:layout_constraintBottom_toTopOf="@+id/guideline2" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@+id/guideline2" /> + app:layout_constraintTop_toTopOf="@+id/guideline2" + app:layout_constraintVertical_bias="0.668" /> <androidx.constraintlayout.widget.Barrier android:layout_width="wrap_content" @@ -31,7 +32,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintGuide_begin="127dp" /> + app:layout_constraintGuide_begin="66dp" /> <Button android:id="@+id/btnAns1" @@ -40,7 +41,7 @@ android:layout_marginStart="10dp" android:layout_marginEnd="10dp" android:layout_marginBottom="8dp" - android:text="ans1" + android:text="@string/ans1" android:backgroundTint="@color/cyan" app:layout_constraintBottom_toTopOf="@+id/guideline4" app:layout_constraintEnd_toStartOf="@+id/guideline3" @@ -54,7 +55,7 @@ android:layout_marginStart="10dp" android:layout_marginTop="8dp" android:layout_marginEnd="10dp" - android:text="ans3" + android:text="@string/ans3" android:backgroundTint="@color/cyan" app:layout_constraintEnd_toStartOf="@+id/guideline3" app:layout_constraintHorizontal_bias="1.0" @@ -68,7 +69,7 @@ android:layout_marginStart="10dp" android:layout_marginEnd="10dp" android:layout_marginBottom="8dp" - android:text="ans2" + android:text="@string/ans2" android:backgroundTint="@color/cyan" app:layout_constraintBottom_toTopOf="@+id/guideline4" app:layout_constraintEnd_toEndOf="parent" @@ -81,7 +82,7 @@ android:layout_marginStart="10dp" android:layout_marginTop="8dp" android:layout_marginEnd="10dp" - android:text="ans4" + android:text="@string/ans4" android:backgroundTint="@color/cyan" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.538" @@ -100,6 +101,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintGuide_begin="550dp" /> + app:layout_constraintGuide_begin="317dp" /> </androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/result_item.xml b/app/src/main/res/layout/result_item.xml index 189d450010a4e21ac4de36c36bd2643f108c1c22..c1e24b13b33e8ffe26f94600c0473fac3960de43 100644 --- a/app/src/main/res/layout/result_item.xml +++ b/app/src/main/res/layout/result_item.xml @@ -3,12 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="wrap_content"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" + android:orientation="horizontal" tools:ignore="MissingConstraints"> <View @@ -25,7 +25,7 @@ <TextView android:id="@+id/score" - android:layout_width="50sp" + android:layout_width="90sp" android:layout_height="100sp" android:text="@string/score" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ca2011c31e1bbcab40e3268fd9880cd186940e77..6269275a92e018041ce12e81e1fb88fd5d77d163 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -35,4 +35,11 @@ <string name="labnum">labNum</string> <string name="name">name</string> <string name="score">Score</string> + <string name="datum">Datum</string> + <string name="labor">Labor</string> + <string name="max_pont">Max Pont</string> + <string name="ans1">ans1</string> + <string name="ans3">ans3</string> + <string name="ans2">ans2</string> + <string name="ans4">ans4</string> </resources> \ No newline at end of file