From b0cc3d8d6156927e8ce496c5f2ff0e5f103f42fa Mon Sep 17 00:00:00 2001
From: clupus <154858@sch.bme.hu>
Date: Sun, 5 Dec 2021 13:41:12 +0100
Subject: [PATCH] =?UTF-8?q?vegs=C5=91=20warningok=20kiv=C3=A9tele,=20leadv?=
=?UTF-8?q?a?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../hu/bme/kszk/kikerdezo/MainActivity.kt | 38 +++++++------------
.../kszk/kikerdezo/QuestionListActivity.kt | 6 +--
.../java/hu/bme/kszk/kikerdezo/UserName.kt | 2 -
.../kszk/kikerdezo/adapter/ResultAdapter.kt | 2 -
.../kikerdezo/connection/NetworkManager.kt | 2 +-
.../hu/bme/kszk/kikerdezo/model/Result.kt | 1 -
.../res/layout/activity_question_list.xml | 6 ++-
.../res/layout/header_navigation_drawer.xml | 4 +-
app/src/main/res/menu/top_app_bar.xml | 15 +-------
app/src/main/res/values/strings.xml | 1 +
10 files changed, 25 insertions(+), 52 deletions(-)
diff --git a/app/src/main/java/hu/bme/kszk/kikerdezo/MainActivity.kt b/app/src/main/java/hu/bme/kszk/kikerdezo/MainActivity.kt
index 24cb733..c75883e 100644
--- a/app/src/main/java/hu/bme/kszk/kikerdezo/MainActivity.kt
+++ b/app/src/main/java/hu/bme/kszk/kikerdezo/MainActivity.kt
@@ -62,7 +62,7 @@ class MainActivity : AppCompatActivity() {
initdatabaseFromApi()
btn1.setOnClickListener {
- Log.d("BUTTON", "Gomb megnyomva!");
+ Log.d("BUTTON", "Gomb megnyomva!")
val intent = Intent(this, QuestionListActivity::class.java).apply {
putExtra(EXTRA_MESSAGE, 1)
@@ -71,7 +71,7 @@ class MainActivity : AppCompatActivity() {
}
btn2.setOnClickListener {
- Log.d("BUTTON", "Gomb megnyomva!");
+ Log.d("BUTTON", "Gomb megnyomva!")
val intent = Intent(this, QuestionListActivity::class.java).apply {
putExtra(EXTRA_MESSAGE, 2)
@@ -79,8 +79,7 @@ class MainActivity : AppCompatActivity() {
startActivity(intent)
}
btn3.setOnClickListener {
- Log.d("BUTTON", "Gomb megnyomva!");
- val text = "Gomb megnyomva!"
+ Log.d("BUTTON", "Gomb megnyomva!")
val intent = Intent(this, QuestionListActivity::class.java).apply {
putExtra(EXTRA_MESSAGE, 3)
@@ -88,7 +87,7 @@ class MainActivity : AppCompatActivity() {
startActivity(intent)
}
btn4.setOnClickListener {
- Log.d("BUTTON", "Gomb megnyomva!");
+ Log.d("BUTTON", "Gomb megnyomva!")
@@ -98,10 +97,7 @@ class MainActivity : AppCompatActivity() {
startActivity(intent)
}
btn5.setOnClickListener {
- Log.d("BUTTON", "Gomb megnyomva!");
- val text = "Gomb megnyomva!"
-
-
+ Log.d("BUTTON", "Gomb megnyomva!")
val intent = Intent(this, QuestionListActivity::class.java).apply {
putExtra(EXTRA_MESSAGE, 5)
@@ -109,9 +105,7 @@ class MainActivity : AppCompatActivity() {
startActivity(intent)
}
btn6.setOnClickListener {
- Log.d("BUTTON", "Gomb megnyomva!");
-
-
+ Log.d("BUTTON", "Gomb megnyomva!")
val intent = Intent(this, QuestionListActivity::class.java).apply {
putExtra(EXTRA_MESSAGE, 6)
@@ -119,9 +113,7 @@ class MainActivity : AppCompatActivity() {
startActivity(intent)
}
btn7.setOnClickListener {
- Log.d("BUTTON", "Gomb megnyomva!");
- val text = "Gomb megnyomva!"
-
+ Log.d("BUTTON", "Gomb megnyomva!")
val intent = Intent(this, QuestionListActivity::class.java).apply {
putExtra(EXTRA_MESSAGE, 7)
@@ -129,7 +121,7 @@ class MainActivity : AppCompatActivity() {
startActivity(intent)
}
btn8.setOnClickListener {
- Log.d("BUTTON", "Gomb megnyomva!");
+ Log.d("BUTTON", "Gomb megnyomva!")
val intent = Intent(this, QuestionListActivity::class.java).apply {
@@ -138,8 +130,7 @@ class MainActivity : AppCompatActivity() {
startActivity(intent)
}
btn9.setOnClickListener {
- Log.d("BUTTON", "Gomb megnyomva!");
-
+ Log.d("BUTTON", "Gomb megnyomva!")
val intent = Intent(this, QuestionListActivity::class.java).apply {
putExtra(EXTRA_MESSAGE, 9)
@@ -147,7 +138,7 @@ class MainActivity : AppCompatActivity() {
startActivity(intent)
}
btn10.setOnClickListener {
- Log.d("BUTTON", "Gomb megnyomva!");
+ Log.d("BUTTON", "Gomb megnyomva!")
val intent = Intent(this, QuestionListActivity::class.java).apply {
@@ -156,7 +147,7 @@ class MainActivity : AppCompatActivity() {
startActivity(intent)
}
btn11.setOnClickListener {
- Log.d("BUTTON", "Gomb megnyomva!");
+ Log.d("BUTTON", "Gomb megnyomva!")
val intent = Intent(this, QuestionListActivity::class.java).apply {
@@ -165,7 +156,7 @@ class MainActivity : AppCompatActivity() {
startActivity(intent)
}
btn12.setOnClickListener {
- Log.d("BUTTON", "Gomb megnyomva!");
+ Log.d("BUTTON", "Gomb megnyomva!")
val intent = Intent(this, QuestionListActivity::class.java).apply {
@@ -174,7 +165,7 @@ class MainActivity : AppCompatActivity() {
startActivity(intent)
}
btn13.setOnClickListener {
- Log.d("BUTTON", "Gomb megnyomva!");
+ Log.d("BUTTON", "Gomb megnyomva!")
val intent = Intent(this, QuestionListActivity::class.java).apply {
@@ -191,9 +182,6 @@ class MainActivity : AppCompatActivity() {
} else if (id == R.id.nev_megadas) {
startActivity(Intent(this, UserName::class.java))
}
- else if (id == R.id.kikerdezo) {
- //semmi
- }
drawerLayout.closeDrawer(GravityCompat.START)
true
}
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 be28c2f..d06af95 100644
--- a/app/src/main/java/hu/bme/kszk/kikerdezo/QuestionListActivity.kt
+++ b/app/src/main/java/hu/bme/kszk/kikerdezo/QuestionListActivity.kt
@@ -21,7 +21,7 @@ class QuestionListActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_question_list)
- var labNum = intent.getIntExtra(EXTRA_MESSAGE, -1)
+ val labNum = intent.getIntExtra(EXTRA_MESSAGE, -1)
if(labNum != -1)
initRecyclerView(labNum)
@@ -52,8 +52,8 @@ class QuestionListActivity : AppCompatActivity() {
val currentDate = sdf.format(Date())
- if(itemCount!= null) {
- for (i in 0 until itemCount!!){
+ if(itemCount != null) {
+ for (i in 0 until itemCount){
val holder = rvMain.findViewHolderForAdapterPosition(i) as Adapter.QuestionViewHolder
if(holder.correct == holder.selected){
scoreCounter += 1
diff --git a/app/src/main/java/hu/bme/kszk/kikerdezo/UserName.kt b/app/src/main/java/hu/bme/kszk/kikerdezo/UserName.kt
index 26ab74b..a54b7b6 100644
--- a/app/src/main/java/hu/bme/kszk/kikerdezo/UserName.kt
+++ b/app/src/main/java/hu/bme/kszk/kikerdezo/UserName.kt
@@ -4,10 +4,8 @@ import android.content.SharedPreferences
import android.preference.PreferenceManager
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
-import android.preference.PreferenceManager.getDefaultSharedPreferences
import android.widget.Button
import android.widget.EditText
-import com.google.android.material.navigation.NavigationView
class UserName : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/hu/bme/kszk/kikerdezo/adapter/ResultAdapter.kt b/app/src/main/java/hu/bme/kszk/kikerdezo/adapter/ResultAdapter.kt
index 7608b63..4e7ca57 100644
--- a/app/src/main/java/hu/bme/kszk/kikerdezo/adapter/ResultAdapter.kt
+++ b/app/src/main/java/hu/bme/kszk/kikerdezo/adapter/ResultAdapter.kt
@@ -20,9 +20,7 @@ class ResultAdapter(val context: Context) :
private val name: TextView = itemView.findViewById(R.id.name)
private val date: TextView = itemView.findViewById(R.id.date)
private val labNum: TextView = itemView.findViewById(R.id.labNum)
- init{
- }
fun bind(result: Result){
score.text = result.score.toString()
name.text = result.uname
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 a0e8fbd..8f25895 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 = "https://mobweb-clupus.k8s-01.sch.bme.hu"
+ private const 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/model/Result.kt b/app/src/main/java/hu/bme/kszk/kikerdezo/model/Result.kt
index 66b11c2..90a1a6d 100644
--- a/app/src/main/java/hu/bme/kszk/kikerdezo/model/Result.kt
+++ b/app/src/main/java/hu/bme/kszk/kikerdezo/model/Result.kt
@@ -3,7 +3,6 @@ package hu.bme.kszk.kikerdezo.model
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
-import java.util.*
@Entity(tableName = "result")
data class Result(
diff --git a/app/src/main/res/layout/activity_question_list.xml b/app/src/main/res/layout/activity_question_list.xml
index 4da7888..311ed98 100644
--- a/app/src/main/res/layout/activity_question_list.xml
+++ b/app/src/main/res/layout/activity_question_list.xml
@@ -27,7 +27,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
- android:clickable="true"
- app:srcCompat="@drawable/baseline_check_circle_24"/>
+ app:srcCompat="@drawable/baseline_check_circle_24"
+ android:contentDescription="@string/pipa" />
+
+ <!-- android:clickable="true"-->
</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/header_navigation_drawer.xml b/app/src/main/res/layout/header_navigation_drawer.xml
index c31fc4f..315ef2c 100644
--- a/app/src/main/res/layout/header_navigation_drawer.xml
+++ b/app/src/main/res/layout/header_navigation_drawer.xml
@@ -10,7 +10,7 @@
android:layout_marginTop="24dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
- android:textSize="32dp"
+ android:textSize="32sp"
android:textColor="?attr/colorOnSurface"
android:text="@string/header_title" />
@@ -21,7 +21,7 @@
android:layout_marginBottom="24dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
- android:textSize="18dp"
+ android:textSize="18sp"
android:textColor="@color/black"
android:text="@string/createdBy" />
diff --git a/app/src/main/res/menu/top_app_bar.xml b/app/src/main/res/menu/top_app_bar.xml
index 452b9db..8ff6ca8 100644
--- a/app/src/main/res/menu/top_app_bar.xml
+++ b/app/src/main/res/menu/top_app_bar.xml
@@ -1,18 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- sample_menu.xml -->
-<menu
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto">
-
- <!--<item
- android:id="@+id/action_settings"
- android:icon="@drawable/round_menu_white_24"
- android:title="@string/settings"
- app:showAsAction="ifRoom|withText"/>-->
- <!--<item
- android:id="@+id/action_done"
- android:icon="@drawable/ic_done"
- android:title="@string/done"
- app:showAsAction="ifRoom|withText"/>-->
+<menu>
</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f879867..00e97e4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,4 +42,5 @@
<string name="ans3">ans3</string>
<string name="ans2">ans2</string>
<string name="ans4">ans4</string>
+ <string name="pipa">pipa</string>
</resources>
\ No newline at end of file
--
GitLab