From a185f459797e502a47bad0dd34f4b5170f9170c2 Mon Sep 17 00:00:00 2001
From: clupus <154858@sch.bme.hu>
Date: Sun, 5 Dec 2021 13:00:04 +0100
Subject: [PATCH] =?UTF-8?q?Bead=C3=A1sra=20k=C3=A9sz,=20design-hoz=20?=
=?UTF-8?q?=C3=A9rt=C5=91=20ember=20(akinek=20van=20sz=C3=A9p=C3=A9rz?=
=?UTF-8?q?=C3=A9ke)=20nyugottan=20foglalkozhatna=20vele?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/misc.xml | 5 ++--
app/build.gradle | 2 +-
app/src/main/AndroidManifest.xml | 4 +--
.../kszk/kikerdezo/QuestionListActivity.kt | 2 +-
.../kikerdezo/connection/NetworkManager.kt | 2 +-
.../bme/kszk/kikerdezo/database/ResultDao.kt | 2 +-
.../res/drawable/rounded_corners_textview.xml | 16 ++++++++++++
app/src/main/res/layout/activity_results.xml | 17 ++++++++-----
app/src/main/res/layout/question_item.xml | 11 ++++++++
app/src/main/res/layout/result_item.xml | 25 +++++++++----------
app/src/main/res/values/colors.xml | 2 ++
app/src/main/res/values/strings.xml | 20 +++++++--------
12 files changed, 71 insertions(+), 37 deletions(-)
create mode 100644 app/src/main/res/drawable/rounded_corners_textview.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 09a8a83..0acc024 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,14 +7,15 @@
<entry key="..\:/Users/csehv/AndroidStudioProjects/Kikerdezo/app/src/main/res/drawable-v24/round_menu_20.xml" value="0.32685185185185184" />
<entry key="..\:/Users/csehv/AndroidStudioProjects/Kikerdezo/app/src/main/res/drawable-v24/round_menu_24.xml" value="0.32685185185185184" />
<entry key="..\:/Users/csehv/AndroidStudioProjects/Kikerdezo/app/src/main/res/drawable/ic_launcher_background.xml" value="0.2765625" />
+ <entry key="..\:/Users/csehv/AndroidStudioProjects/Kikerdezo/app/src/main/res/drawable/rounded_corners_textview.xml" value="0.37864583333333335" />
<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" />
- <entry key="..\:/Users/csehv/AndroidStudioProjects/Kikerdezo/app/src/main/res/layout/result_item.xml" value="0.25" />
+ <entry key="..\:/Users/csehv/AndroidStudioProjects/Kikerdezo/app/src/main/res/layout/question_item.xml" value="0.4932014833127318" />
+ <entry key="..\:/Users/csehv/AndroidStudioProjects/Kikerdezo/app/src/main/res/layout/result_item.xml" value="0.33" />
<entry key="..\:/Users/csehv/AndroidStudioProjects/Kikerdezo/app/src/main/res/menu/navigation_drawer.xml" value="0.5" />
<entry key="..\:/Users/csehv/AndroidStudioProjects/Kikerdezo/app/src/main/res/menu/top_app_bar.xml" value="0.2814814814814815" />
</map>
diff --git a/app/build.gradle b/app/build.gradle
index d6ed52d..9c79bc9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -50,7 +50,7 @@ dependencies {
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
- implementation 'com.google.android.material:material:1.4.0'
+ implementation 'com.google.android.material:material:1.6.0-alpha01'
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 83b713f..f64ef9d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="hu.bme.kszk.kikerdezo"
- android:targetSandboxVersion="1">
+ package="hu.bme.kszk.kikerdezo">
+ <!--android:targetSandboxVersion="1"-->
<uses-permission android:name="android.permission.INTERNET" />
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 d2c90b3..be28c2f 100644
--- a/app/src/main/java/hu/bme/kszk/kikerdezo/QuestionListActivity.kt
+++ b/app/src/main/java/hu/bme/kszk/kikerdezo/QuestionListActivity.kt
@@ -60,7 +60,7 @@ class QuestionListActivity : AppCompatActivity() {
}
}
}
- var result = Result(
+ val result = Result(
null,
labNum,
sp.getString("USERNAME", "PlayerOne").toString(),
diff --git a/app/src/main/java/hu/bme/kszk/kikerdezo/connection/NetworkManager.kt b/app/src/main/java/hu/bme/kszk/kikerdezo/connection/NetworkManager.kt
index f433a09..a0e8fbd 100644
--- a/app/src/main/java/hu/bme/kszk/kikerdezo/connection/NetworkManager.kt
+++ b/app/src/main/java/hu/bme/kszk/kikerdezo/connection/NetworkManager.kt
@@ -10,7 +10,7 @@ object NetworkManager {
private val retrofit: Retrofit
private val questionApi: QuestionApi
- private val SERVICE_URL = "http://192.168.1.72:8080"
+ private val SERVICE_URL = "https://mobweb-clupus.k8s-01.sch.bme.hu"
init{
retrofit = Retrofit.Builder()
diff --git a/app/src/main/java/hu/bme/kszk/kikerdezo/database/ResultDao.kt b/app/src/main/java/hu/bme/kszk/kikerdezo/database/ResultDao.kt
index 9b9b50b..2a904ae 100644
--- a/app/src/main/java/hu/bme/kszk/kikerdezo/database/ResultDao.kt
+++ b/app/src/main/java/hu/bme/kszk/kikerdezo/database/ResultDao.kt
@@ -8,7 +8,7 @@ import hu.bme.kszk.kikerdezo.model.Result
@Dao
interface ResultDao {
- @Query("SELECT * FROM result ORDER BY score")
+ @Query("SELECT * FROM result ORDER BY date")
fun getResults(): LiveData<List<Result>>
@Insert
diff --git a/app/src/main/res/drawable/rounded_corners_textview.xml b/app/src/main/res/drawable/rounded_corners_textview.xml
new file mode 100644
index 0000000..e180f81
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_corners_textview.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+ <stroke
+ android:width="1dp"
+ android:color="@color/slightly_darker_light_blue" />
+
+ <solid android:color="@color/light_blue" />
+
+ <padding
+ android:left="1dp"
+ android:right="1dp"
+ android:bottom="1dp"
+ android:top="1dp" />
+
+ <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_results.xml b/app/src/main/res/layout/activity_results.xml
index 91b9248..6ede96b 100644
--- a/app/src/main/res/layout/activity_results.xml
+++ b/app/src/main/res/layout/activity_results.xml
@@ -59,29 +59,34 @@
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="30sp"
- android:orientation="horizontal">
+ android:layout_height="20sp"
+ android:orientation="horizontal"
+ android:background="@android:color/darker_gray">
<TextView
android:layout_width="90sp"
android:layout_height="100sp"
- android:text="@string/max_pont" />
+ android:text="@string/max_pont"
+ android:textColor="@color/black"/>
<TextView
android:layout_width="80sp"
android:layout_height="100sp"
- android:text="@string/nev" />
+ android:text="@string/nev"
+ android:textColor="@color/black"/>
<TextView
android:layout_width="50sp"
android:layout_height="100sp"
- android:text="@string/labor"/>
+ android:text="@string/labor"
+ android:textColor="@color/black"/>
<TextView
android:layout_width="0dp"
android:layout_height="100sp"
android:layout_weight="1"
- android:text="@string/datum" />
+ android:text="@string/datum"
+ android:textColor="@color/black"/>
</LinearLayout>
diff --git a/app/src/main/res/layout/question_item.xml b/app/src/main/res/layout/question_item.xml
index 4e43cd3..6b9faad 100644
--- a/app/src/main/res/layout/question_item.xml
+++ b/app/src/main/res/layout/question_item.xml
@@ -12,7 +12,9 @@
android:layout_marginStart="30dp"
android:layout_marginTop="40dp"
android:layout_marginEnd="30dp"
+ android:background="@drawable/rounded_corners_textview"
android:text="@string/questiongoeshere"
+ android:textAlignment="center"
android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@+id/guideline2"
app:layout_constraintEnd_toEndOf="parent"
@@ -89,6 +91,15 @@
app:layout_constraintStart_toStartOf="@+id/guideline3"
app:layout_constraintTop_toTopOf="@+id/guideline4" />
+ <com.google.android.material.divider.MaterialDivider
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:dividerInsetEnd="16dp"
+ app:dividerInsetStart="16dp"
+ app:dividerThickness="2dp"
+ app:layout_constraintBottom_toTopOf="@+id/question"
+ app:layout_constraintTop_toTopOf="parent" />
+
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline3"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/result_item.xml b/app/src/main/res/layout/result_item.xml
index c1e24b1..4d66177 100644
--- a/app/src/main/res/layout/result_item.xml
+++ b/app/src/main/res/layout/result_item.xml
@@ -8,47 +8,46 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
+ android:orientation="vertical"
tools:ignore="MissingConstraints">
- <View
- android:id="@+id/divider"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:background="?android:attr/listDivider" />
-
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="120sp"
+ android:layout_height="20sp"
android:orientation="horizontal">
<TextView
android:id="@+id/score"
android:layout_width="90sp"
- android:layout_height="100sp"
+ android:layout_height="20sp"
android:text="@string/score" />
<TextView
android:id="@+id/name"
android:layout_width="80sp"
- android:layout_height="100sp"
+ android:layout_height="20sp"
android:text="@string/name" />
<TextView
android:layout_width="50sp"
- android:layout_height="100sp"
+ android:layout_height="20sp"
android:text="@string/labnum"
android:id="@+id/labNum"/>
<TextView
android:id="@+id/date"
android:layout_width="0dp"
- android:layout_height="100sp"
+ android:layout_height="20sp"
android:layout_weight="1"
android:text="@string/date" />
</LinearLayout>
+ <com.google.android.material.divider.MaterialDivider
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:dividerInsetStart="16dp"
+ app:dividerInsetEnd="16dp"
+ app:dividerThickness="2dp"/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 086c6c4..debfe85 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,4 +8,6 @@
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="cyan">#FF00FFFF</color>
+ <color name="light_blue">#E6F3F8</color>
+ <color name="slightly_darker_light_blue">#BCD2E8</color>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6269275..f879867 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,11 +1,11 @@
<resources>
- <string name="app_name">Kikerdezo</string>
- <string name="settings">menu</string>
- <string name="eredmenyek">Eredmenyek</string>
- <string name="nev">Nev</string>
+ <string name="app_name">Kikérdező</string>
+ <string name="settings">menü</string>
+ <string name="eredmenyek">Eredmények</string>
+ <string name="nev">Név</string>
<string name="header_text">PlayerOne</string>
- <string name="header_title">Mob-Web Kikerdezo</string>
- <string name="createdBy">Keszitette: Cseh Viktor</string>
+ <string name="header_title">Mob-Web Kikérdező</string>
+ <string name="createdBy">Készítette: Cseh Viktor @KSZK</string>
<string name="_1_labor">1. Labor</string>
<string name="_2_labor">2. Labor</string>
<string name="_3_labor">3. Labor</string>
@@ -29,15 +29,15 @@
<string name="hello_first_fragment">Hello first fragment</string>
<string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
<string name="questiongoeshere">QuestionGoesHere</string>
- <string name="oke">Oke</string>
- <string name="kikerdezo">Kikerdezo</string>
+ <string name="oke">Oké</string>
+ <string name="kikerdezo">Kikérdező</string>
<string name="date">Date</string>
<string name="labnum">labNum</string>
<string name="name">name</string>
<string name="score">Score</string>
- <string name="datum">Datum</string>
+ <string name="datum">Dátum</string>
<string name="labor">Labor</string>
- <string name="max_pont">Max Pont</string>
+ <string name="max_pont">Elért pont</string>
<string name="ans1">ans1</string>
<string name="ans3">ans3</string>
<string name="ans2">ans2</string>
--
GitLab