From 9991f99875c72b262ad69703d170062c840da6e9 Mon Sep 17 00:00:00 2001
From: fpeterfalvi <fpeterfalvi@gmail.com>
Date: Sat, 7 Apr 2018 20:39:01 +0200
Subject: [PATCH] Choosing of question file improved.
The name of the chosen file is displayed and a default file is added if no file is chosen manually.
---
.../app/src/main/assets/defaultQuestions.txt | 3 ++
KvizServer/app/src/main/assets/tippek.txt | 7 ++++
.../java/onlab/kvizserver/GameActivity.java | 8 +++--
.../java/onlab/kvizserver/LobbyActivity.java | 2 +-
.../java/onlab/kvizserver/MainActivity.java | 2 ++
.../app/src/main/res/layout/activity_main.xml | 33 +++++++++++++++----
6 files changed, 46 insertions(+), 9 deletions(-)
create mode 100644 KvizServer/app/src/main/assets/defaultQuestions.txt
create mode 100644 KvizServer/app/src/main/assets/tippek.txt
diff --git a/KvizServer/app/src/main/assets/defaultQuestions.txt b/KvizServer/app/src/main/assets/defaultQuestions.txt
new file mode 100644
index 0000000..e199d5d
--- /dev/null
+++ b/KvizServer/app/src/main/assets/defaultQuestions.txt
@@ -0,0 +1,3 @@
+Hogyan írjuk arab számmal a következő római számot: CXLVII? 147
+Mi az 10011 kettes számrendszerbeli szám tizes számrendszerbeli alakja? 19
+Melyik évben volt a mohácsi csata? 1526
diff --git a/KvizServer/app/src/main/assets/tippek.txt b/KvizServer/app/src/main/assets/tippek.txt
new file mode 100644
index 0000000..683eedc
--- /dev/null
+++ b/KvizServer/app/src/main/assets/tippek.txt
@@ -0,0 +1,7 @@
+Melyik a legnagyobb egyjegyű prímszám? 7
+Hány éle van egy kockának? 12
+Hányadik kerületben van a BME? 11
+Hány kétjegyű szám van? 90
+Hány napos hónap április? 30
+Ha egy négyzet oldalát kétszeresére növeljük, hányszorosára nő a területe? 4
+Hányas számú metró közlekedik Kelenföld és a Keleti pályaudvar között? 4
diff --git a/KvizServer/app/src/main/java/onlab/kvizserver/GameActivity.java b/KvizServer/app/src/main/java/onlab/kvizserver/GameActivity.java
index e888b40..71422ee 100644
--- a/KvizServer/app/src/main/java/onlab/kvizserver/GameActivity.java
+++ b/KvizServer/app/src/main/java/onlab/kvizserver/GameActivity.java
@@ -39,11 +39,15 @@ public class GameActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_game);
Bundle extras = getIntent().getExtras();
- String questionFileName = extras.getString("QUESTION_FILE_NAME");
+ String questionFileName = extras.getString("QUESTION_FILE_NAME", null);
BufferedReader buffreader;
try {
- buffreader = new BufferedReader(new InputStreamReader(new FileInputStream(new File(questionFileName))));
+ if (questionFileName == null) {
+ buffreader = new BufferedReader(new InputStreamReader(getAssets().open("defaultQuestions.txt")));
+ } else {
+ buffreader = new BufferedReader(new InputStreamReader(new FileInputStream(new File(questionFileName))));
+ }
String line;
while ((line = buffreader.readLine()) != null) {
String[] parts = line.split("\t");
diff --git a/KvizServer/app/src/main/java/onlab/kvizserver/LobbyActivity.java b/KvizServer/app/src/main/java/onlab/kvizserver/LobbyActivity.java
index 8489950..6512140 100644
--- a/KvizServer/app/src/main/java/onlab/kvizserver/LobbyActivity.java
+++ b/KvizServer/app/src/main/java/onlab/kvizserver/LobbyActivity.java
@@ -86,7 +86,7 @@ public class LobbyActivity extends AppCompatActivity {
HOSTNAME = "";
} else {
HOSTNAME = extras.getString("STRING_HOSTNAME");
- questionFileName = extras.getString("QUESTION_FILE_NAME");
+ questionFileName = extras.getString("QUESTION_FILE_NAME", null);
}
} else {
HOSTNAME = (String) savedInstanceState.getSerializable("STRING_HOSTNAME");
diff --git a/KvizServer/app/src/main/java/onlab/kvizserver/MainActivity.java b/KvizServer/app/src/main/java/onlab/kvizserver/MainActivity.java
index 785c7e4..0ecd77e 100644
--- a/KvizServer/app/src/main/java/onlab/kvizserver/MainActivity.java
+++ b/KvizServer/app/src/main/java/onlab/kvizserver/MainActivity.java
@@ -55,6 +55,8 @@ public class MainActivity extends AppCompatActivity implements FileDialog.OnFile
public void onFileSelected(FileDialog dialog, File file) {
try {
fileCanonicalPath = file.getCanonicalPath();
+ TextView questionFileTextView = (TextView) findViewById(R.id.QuestionFileTextView);
+ questionFileTextView.setText(fileCanonicalPath);
Log.d("MainActivity", fileCanonicalPath);
} catch (IOException e) {
e.printStackTrace();
diff --git a/KvizServer/app/src/main/res/layout/activity_main.xml b/KvizServer/app/src/main/res/layout/activity_main.xml
index e215fa9..0e884b0 100644
--- a/KvizServer/app/src/main/res/layout/activity_main.xml
+++ b/KvizServer/app/src/main/res/layout/activity_main.xml
@@ -10,7 +10,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Server name!"
+ android:text="Server name:"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
@@ -28,16 +28,37 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.231" />
- <Button
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="Choose question file"
- android:id="@+id/ChooseQuestionFile"
+ android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.433" />
+ app:layout_constraintVertical_bias="0.453">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:text="Question file:" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:text=""
+ android:id="@+id/QuestionFileTextView" />
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:text="Browse"
+ android:id="@+id/ChooseQuestionFile" />
+
+ </LinearLayout>
<Button
android:layout_width="wrap_content"
--
GitLab