From 91008dadf3e4a832ed7cec2e7eecfccb0e0f5419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yi=C4=9Fit=20=C3=87olako=C4=9Flu?=
 <yigitcolakoglu@hotmail.com>
Date: Wed, 13 Mar 2019 14:08:46 +0300
Subject: [PATCH] Designing GUI

---
 .../app/src/main/res/drawable-v21/subway.xml  |  9 ++++
 MyCity/app/src/main/res/drawable/parking.svg  | 46 +++++++++++++++++++
 .../src/main/res/layout/nav_header_main.xml   |  6 ---
 .../main/res/menu/activity_main_drawer.xml    |  2 +-
 server_side/{ => Chatbot}/keywords.json       |  0
 server_side/{ => Chatbot}/main.py             |  0
 server_side/{ => Chatbot}/parser_test.py      |  0
 server_side/{ => Chatbot}/predefined.json     |  0
 server_side/{ => Chatbot}/train.py            |  0
 server_side/{ => Chatbot}/user_details.json   |  0
 10 files changed, 56 insertions(+), 7 deletions(-)
 create mode 100644 MyCity/app/src/main/res/drawable-v21/subway.xml
 create mode 100644 MyCity/app/src/main/res/drawable/parking.svg
 rename server_side/{ => Chatbot}/keywords.json (100%)
 rename server_side/{ => Chatbot}/main.py (100%)
 rename server_side/{ => Chatbot}/parser_test.py (100%)
 rename server_side/{ => Chatbot}/predefined.json (100%)
 rename server_side/{ => Chatbot}/train.py (100%)
 rename server_side/{ => Chatbot}/user_details.json (100%)

diff --git a/MyCity/app/src/main/res/drawable-v21/subway.xml b/MyCity/app/src/main/res/drawable-v21/subway.xml
new file mode 100644
index 0000000..d8e58fe
--- /dev/null
+++ b/MyCity/app/src/main/res/drawable-v21/subway.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="484.5"
+    android:viewportHeight="484.5"
+    android:width="484.5dp"
+    android:height="484.5dp">
+    <path
+        android:pathData="M242.25 0c-112.2 0 -204 12.75 -204 102v242.25c0 48.45 40.8 89.25 89.25 89.25l-38.25 38.25v12.75h306v-12.75L357 433.5c48.45 0 89.25 -40.8 89.25 -89.25V102C446.25 12.75 354.45 0 242.25 0zM127.5 382.5c-20.4 0 -38.25 -17.85 -38.25 -38.25S107.1 306 127.5 306s38.25 17.85 38.25 38.25S147.9 382.5 127.5 382.5zM216.75 229.5H89.25V102h127.5V229.5zM357 382.5c-20.4 0 -38.25 -17.85 -38.25 -38.25S336.6 306 357 306s38.25 17.85 38.25 38.25S377.4 382.5 357 382.5zM395.25 229.5h-127.5V102h127.5V229.5z"
+        android:fillColor="#000000" />
+</vector>
\ No newline at end of file
diff --git a/MyCity/app/src/main/res/drawable/parking.svg b/MyCity/app/src/main/res/drawable/parking.svg
new file mode 100644
index 0000000..9440136
--- /dev/null
+++ b/MyCity/app/src/main/res/drawable/parking.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<g>
+	<g>
+		<g>
+			<path d="M452,0H60C26.916,0,0,26.916,0,60v392c0,33.084,26.916,60,60,60h392c33.084,0,60-26.916,60-60V60
+				C512,26.916,485.084,0,452,0z M472,452c0,11.028-8.972,20-20,20H60c-11.028,0-20-8.972-20-20V60c0-11.028,8.972-20,20-20h392
+				c11.028,0,20,8.972,20,20V452z"/>
+			<path d="M286,100H146v312h40V300h100c55.14,0,100-44.86,100-100S341.14,100,286,100z M286,260H186V140h100
+				c33.084,0,60,26.916,60,60S319.084,260,286,260z"/>
+		</g>
+	</g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
diff --git a/MyCity/app/src/main/res/layout/nav_header_main.xml b/MyCity/app/src/main/res/layout/nav_header_main.xml
index 2e4f18c..e59881d 100644
--- a/MyCity/app/src/main/res/layout/nav_header_main.xml
+++ b/MyCity/app/src/main/res/layout/nav_header_main.xml
@@ -28,10 +28,4 @@
 			android:text="@string/nav_header_title"
 			android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
 
-	<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/nav_header_subtitle"
-			android:id="@+id/textView"/>
-
 </LinearLayout>
diff --git a/MyCity/app/src/main/res/menu/activity_main_drawer.xml b/MyCity/app/src/main/res/menu/activity_main_drawer.xml
index 55c2bb2..3c52e85 100644
--- a/MyCity/app/src/main/res/menu/activity_main_drawer.xml
+++ b/MyCity/app/src/main/res/menu/activity_main_drawer.xml
@@ -6,7 +6,7 @@
 	<group android:checkableBehavior="single">
 		<item
 				android:id="@+id/nav_camera"
-				android:icon="@drawable/ic_menu_camera"
+				android:icon="@drawable/subway"
 				android:title="Import"/>
 		<item
 				android:id="@+id/nav_gallery"
diff --git a/server_side/keywords.json b/server_side/Chatbot/keywords.json
similarity index 100%
rename from server_side/keywords.json
rename to server_side/Chatbot/keywords.json
diff --git a/server_side/main.py b/server_side/Chatbot/main.py
similarity index 100%
rename from server_side/main.py
rename to server_side/Chatbot/main.py
diff --git a/server_side/parser_test.py b/server_side/Chatbot/parser_test.py
similarity index 100%
rename from server_side/parser_test.py
rename to server_side/Chatbot/parser_test.py
diff --git a/server_side/predefined.json b/server_side/Chatbot/predefined.json
similarity index 100%
rename from server_side/predefined.json
rename to server_side/Chatbot/predefined.json
diff --git a/server_side/train.py b/server_side/Chatbot/train.py
similarity index 100%
rename from server_side/train.py
rename to server_side/Chatbot/train.py
diff --git a/server_side/user_details.json b/server_side/Chatbot/user_details.json
similarity index 100%
rename from server_side/user_details.json
rename to server_side/Chatbot/user_details.json