added code for visualization of the sematic graph in the app. The code is there but the menu item for activating it is not there yet since the functionality is not complete

9 files changed, 74 insertions, 1 deletions

diff --git a/src/ui/android/res/drawable-hdpi/ic_search_black_24dp.png b/src/ui/android/res/drawable-hdpi/ic_search_black_24dp.png
new file mode 100644
index 000000000..c593e7ad8
--- /dev/null
+++ b/src/ui/android/res/drawable-hdpi/ic_search_black_24dp.png
diff --git a/src/ui/android/res/drawable-mdpi/ic_search_black_24dp.png b/src/ui/android/res/drawable-mdpi/ic_search_black_24dp.png
new file mode 100644
index 000000000..6b1634323
--- /dev/null
+++ b/src/ui/android/res/drawable-mdpi/ic_search_black_24dp.png
diff --git a/src/ui/android/res/drawable-xhdpi/ic_search_black_24dp.png b/src/ui/android/res/drawable-xhdpi/ic_search_black_24dp.png
new file mode 100644
index 000000000..638190268
--- /dev/null
+++ b/src/ui/android/res/drawable-xhdpi/ic_search_black_24dp.png
diff --git a/src/ui/android/res/drawable-xxhdpi/ic_search_black_24dp.png b/src/ui/android/res/drawable-xxhdpi/ic_search_black_24dp.png
new file mode 100644
index 000000000..3ae490ef9
--- /dev/null
+++ b/src/ui/android/res/drawable-xxhdpi/ic_search_black_24dp.png
diff --git a/src/ui/android/res/drawable-xxxhdpi/ic_search_black_24dp.png b/src/ui/android/res/drawable-xxxhdpi/ic_search_black_24dp.png
new file mode 100644
index 000000000..21be57299
--- /dev/null
+++ b/src/ui/android/res/drawable-xxxhdpi/ic_search_black_24dp.png
diff --git a/src/ui/android/res/layout/activity_help.xml b/src/ui/android/res/layout/activity_help.xml
index 645f061af..3cb88a569 100644
--- a/src/ui/android/res/layout/activity_help.xml
+++ b/src/ui/android/res/layout/activity_help.xml
@@ -8,4 +8,4 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         />
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/src/ui/android/res/layout/activity_semantic_graph.xml b/src/ui/android/res/layout/activity_semantic_graph.xml
new file mode 100644
index 000000000..004e22a7c
--- /dev/null
+++ b/src/ui/android/res/layout/activity_semantic_graph.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_height="match_parent"
+	android:layout_width="match_parent">
+
+	<RelativeLayout
+		android:layout_height="match_parent"
+		android:layout_width="match_parent">
+
+		<RelativeLayout
+			android:id="@+id/graph_header"
+			android:layout_height="wrap_content"
+			android:layout_width="match_parent"
+			android:layout_alignParentTop="true"
+			android:layout_alignParentLeft="true"
+			android:layout_alignParentRight="true"
+			android:padding="8dp"
+			android:background="#C0C0C0">
+
+			<ImageView
+				android:id="@+id/add_word"
+				android:layout_height="wrap_content"
+				android:layout_width="wrap_content"
+				android:layout_alignParentRight="true"
+				android:padding="8dp"
+				android:src="@drawable/ic_search_black_24dp"/>
+
+			<org.grammaticalframework.ui.android.LanguageSelector
+				android:id="@+id/show_language"
+				android:layout_height="wrap_content"
+				android:layout_width="match_parent"
+				android:layout_alignParentLeft="true"
+				android:layout_alignParentTop="true"
+				android:layout_toLeftOf="@id/add_word"
+				android:padding="0dp"/>
+		</RelativeLayout>
+		
+		<org.grammaticalframework.ui.android.SemanticGraphView
+				android:id="@+id/semantic_graph"
+				android:layout_height="match_parent"
+				android:layout_width="match_parent"
+				android:layout_alignParentLeft="true"
+			    android:layout_alignParentBottom="true"
+			    android:layout_alignParentRight="true"
+			    android:layout_below="@id/graph_header"/>
+	</RelativeLayout>
+
+	<LinearLayout
+		android:id="@+id/progressBarView" 
+		android:gravity="center"
+		android:visibility="gone"
+		android:background="#00000000"
+		android:layout_height="match_parent"
+		android:layout_width="match_parent">
+
+		<ProgressBar
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"/>	
+	</LinearLayout>
+</FrameLayout>
diff --git a/src/ui/android/res/values/strings.xml b/src/ui/android/res/values/strings.xml
index ca103623e..6ce31d213 100644
--- a/src/ui/android/res/values/strings.xml
+++ b/src/ui/android/res/values/strings.xml
@@ -7,6 +7,7 @@
 	<string name="open_image">Opening</string>
 	<string name="mic_input">Speech Input</string>
 	<string name="keyboard_input">Keyboard Input</string>
+	<string name="semantic_graph">Semantic Graph</string>
 	<string name="help">Help</string>
 	<string name="global_preferences_key">org.grammaticalframework.ui.android.GLOBAL_PREFERENCES</string>
 
@@ -24,4 +25,7 @@
     <!-- Labels for subtype -->
     <string name="normalKeyboardMode">normalKeyboardMode</string>
     <string name="internalKeyboardMode">internalKeyboardMode</string>
+    
+    <string name="search_hint">Search word:</string>
+    <string name="search_description">Search for words in the lexicon</string>
 </resources>
diff --git a/src/ui/android/res/xml/searchable.xml b/src/ui/android/res/xml/searchable.xml
new file mode 100644
index 000000000..7e7b6a846
--- /dev/null
+++ b/src/ui/android/res/xml/searchable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+    android:label="@string/app_name"
+    android:hint="@string/search_hint"
+    android:searchSuggestAuthority="org.grammaticalframework.ui.android.LexiconSuggestionProvider"
+    android:includeInGlobalSearch="true"
+    android:searchSettingsDescription="@string/search_description">
+</searchable>