Skip to content
Snippets Groups Projects
Unverified Commit bfa466f0 authored by Cseh Viktor's avatar Cseh Viktor
Browse files

Asszem a nagyja kesz. Max design van hatra meg atirni az api cimiet a deploy-hoz

parent 17c083e8
Branches
No related tags found
No related merge requests found
...@@ -10,6 +10,7 @@ ...@@ -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_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.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_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/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/header_navigation_drawer.xml" value="0.20260416666666667" />
<entry key="..\:/Users/csehv/AndroidStudioProjects/Kikerdezo/app/src/main/res/layout/question_item.xml" value="0.33" /> <entry key="..\:/Users/csehv/AndroidStudioProjects/Kikerdezo/app/src/main/res/layout/question_item.xml" value="0.33" />
......
...@@ -18,18 +18,22 @@ ...@@ -18,18 +18,22 @@
tools:targetApi="m"> tools:targetApi="m">
<activity <activity
android:name=".ResultsActivity" android:name=".ResultsActivity"
android:exported="false" /> android:exported="false"
android:screenOrientation="portrait"/>
<activity <activity
android:name=".UserName" android:name=".UserName"
android:exported="false"></activity> android:exported="false"
android:screenOrientation="portrait"></activity>
<activity <activity
android:name=".QuestionListActivity" android:name=".QuestionListActivity"
android:exported="false" android:exported="false"
android:label="@string/title_activity_question" android:label="@string/title_activity_question"
android:theme="@style/Theme.Kikerdezo.NoActionBar" /> android:theme="@style/Theme.Kikerdezo.NoActionBar"
android:screenOrientation="portrait"/>
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:exported="true"> android:exported="true"
android:screenOrientation="portrait">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
......
...@@ -80,7 +80,7 @@ class QuestionListActivity : AppCompatActivity() { ...@@ -80,7 +80,7 @@ class QuestionListActivity : AppCompatActivity() {
rvMain.adapter = questionAdapter rvMain.adapter = questionAdapter
AppDatabase.getInstanceQuestion(this@QuestionListActivity).questionDao().getLabQuestion(b).observe(this, { questions -> 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
}) })
} }
......
...@@ -57,6 +57,33 @@ ...@@ -57,6 +57,33 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> 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 <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvResults" android:id="@+id/rvResults"
......
...@@ -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"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content">
<TextView <TextView
android:id="@+id/question" android:id="@+id/question"
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
app:layout_constraintBottom_toTopOf="@+id/guideline2" app:layout_constraintBottom_toTopOf="@+id/guideline2"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="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 <androidx.constraintlayout.widget.Barrier
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -31,7 +32,7 @@ ...@@ -31,7 +32,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintGuide_begin="127dp" /> app:layout_constraintGuide_begin="66dp" />
<Button <Button
android:id="@+id/btnAns1" android:id="@+id/btnAns1"
...@@ -40,7 +41,7 @@ ...@@ -40,7 +41,7 @@
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:text="ans1" android:text="@string/ans1"
android:backgroundTint="@color/cyan" android:backgroundTint="@color/cyan"
app:layout_constraintBottom_toTopOf="@+id/guideline4" app:layout_constraintBottom_toTopOf="@+id/guideline4"
app:layout_constraintEnd_toStartOf="@+id/guideline3" app:layout_constraintEnd_toStartOf="@+id/guideline3"
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:text="ans3" android:text="@string/ans3"
android:backgroundTint="@color/cyan" android:backgroundTint="@color/cyan"
app:layout_constraintEnd_toStartOf="@+id/guideline3" app:layout_constraintEnd_toStartOf="@+id/guideline3"
app:layout_constraintHorizontal_bias="1.0" app:layout_constraintHorizontal_bias="1.0"
...@@ -68,7 +69,7 @@ ...@@ -68,7 +69,7 @@
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:text="ans2" android:text="@string/ans2"
android:backgroundTint="@color/cyan" android:backgroundTint="@color/cyan"
app:layout_constraintBottom_toTopOf="@+id/guideline4" app:layout_constraintBottom_toTopOf="@+id/guideline4"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -81,7 +82,7 @@ ...@@ -81,7 +82,7 @@
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:text="ans4" android:text="@string/ans4"
android:backgroundTint="@color/cyan" android:backgroundTint="@color/cyan"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.538" app:layout_constraintHorizontal_bias="0.538"
...@@ -100,6 +101,6 @@ ...@@ -100,6 +101,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintGuide_begin="550dp" /> app:layout_constraintGuide_begin="317dp" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="horizontal"
tools:ignore="MissingConstraints"> tools:ignore="MissingConstraints">
<View <View
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<TextView <TextView
android:id="@+id/score" android:id="@+id/score"
android:layout_width="50sp" android:layout_width="90sp"
android:layout_height="100sp" android:layout_height="100sp"
android:text="@string/score" /> android:text="@string/score" />
......
...@@ -35,4 +35,11 @@ ...@@ -35,4 +35,11 @@
<string name="labnum">labNum</string> <string name="labnum">labNum</string>
<string name="name">name</string> <string name="name">name</string>
<string name="score">Score</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> </resources>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment