diff options
Diffstat (limited to 'src/ui/android/res')
| -rw-r--r-- | src/ui/android/res/drawable-hdpi/ic_drawer.png | bin | 0 -> 2829 bytes | |||
| -rw-r--r-- | src/ui/android/res/drawable-mdpi/ic_drawer.png | bin | 0 -> 2820 bytes | |||
| -rw-r--r-- | src/ui/android/res/drawable-xhdpi/ic_drawer.png | bin | 0 -> 2836 bytes | |||
| -rw-r--r-- | src/ui/android/res/drawable-xxhdpi/ic_drawer.png | bin | 0 -> 202 bytes | |||
| -rw-r--r-- | src/ui/android/res/layout/activity_lexical_entry.xml | 89 | ||||
| -rw-r--r-- | src/ui/android/res/layout/lexical_item.xml | 4 | ||||
| -rw-r--r-- | src/ui/android/res/menu/main.xml | 2 | ||||
| -rw-r--r-- | src/ui/android/res/values/strings.xml | 4 |
8 files changed, 61 insertions, 38 deletions
diff --git a/src/ui/android/res/drawable-hdpi/ic_drawer.png b/src/ui/android/res/drawable-hdpi/ic_drawer.png Binary files differnew file mode 100644 index 000000000..c59f601ca --- /dev/null +++ b/src/ui/android/res/drawable-hdpi/ic_drawer.png diff --git a/src/ui/android/res/drawable-mdpi/ic_drawer.png b/src/ui/android/res/drawable-mdpi/ic_drawer.png Binary files differnew file mode 100644 index 000000000..1ed2c56ee --- /dev/null +++ b/src/ui/android/res/drawable-mdpi/ic_drawer.png diff --git a/src/ui/android/res/drawable-xhdpi/ic_drawer.png b/src/ui/android/res/drawable-xhdpi/ic_drawer.png Binary files differnew file mode 100644 index 000000000..a5fa74def --- /dev/null +++ b/src/ui/android/res/drawable-xhdpi/ic_drawer.png diff --git a/src/ui/android/res/drawable-xxhdpi/ic_drawer.png b/src/ui/android/res/drawable-xxhdpi/ic_drawer.png Binary files differnew file mode 100644 index 000000000..9c4685d6e --- /dev/null +++ b/src/ui/android/res/drawable-xxhdpi/ic_drawer.png diff --git a/src/ui/android/res/layout/activity_lexical_entry.xml b/src/ui/android/res/layout/activity_lexical_entry.xml index 0dc7fc7be..fa49f252b 100644 --- a/src/ui/android/res/layout/activity_lexical_entry.xml +++ b/src/ui/android/res/layout/activity_lexical_entry.xml @@ -4,49 +4,66 @@ android:layout_height="match_parent" android:layout_width="match_parent"> - <RelativeLayout - android:layout_height="match_parent" - android:layout_width="match_parent"> + <android.support.v4.widget.DrawerLayout + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <!-- The main content view --> <RelativeLayout - android:id="@+id/lexical_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"> - - <org.grammaticalframework.ui.android.LanguageSelector - android:id="@+id/show_language" + android:layout_height="match_parent" + android:layout_width="match_parent"> + + <RelativeLayout + android:id="@+id/lexical_header" android:layout_height="wrap_content" android:layout_width="match_parent" - android:layout_alignParentLeft="true" android:layout_alignParentTop="true" - android:padding="0dp"/> + android:layout_alignParentLeft="true" + android:layout_alignParentRight="true" + android:padding="8dp" + android:background="#C0C0C0"> + <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:padding="0dp"/> + + </RelativeLayout> + + <TextView + android:id="@+id/lexical_desc" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/lexical_header" + android:paddingLeft="1dp" + android:paddingTop="4dp" + android:paddingBottom="2dp" + android:textSize="25sp"/> + + <ListView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_below="@id/lexical_desc" + android:orientation="vertical" + android:paddingLeft="1dp" + android:id="@android:id/list" > + </ListView> </RelativeLayout> - - <TextView - android:id="@+id/lexical_desc" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_below="@+id/lexical_header" - android:paddingLeft="1dp" - android:paddingTop="4dp" - android:paddingBottom="2dp" - android:textSize="25sp"/> - - <ListView - android:layout_width="match_parent" + + <!-- The navigation drawer --> + <ListView android:id="@+id/topics_list" + android:layout_width="250dp" android:layout_height="match_parent" - android:layout_below="@id/lexical_desc" - android:orientation="vertical" - android:paddingLeft="1dp" - android:id="@android:id/list" > - </ListView> - </RelativeLayout> + android:layout_gravity="start" + android:choiceMode="singleChoice" + android:divider="@android:color/transparent" + android:dividerHeight="0dp" + android:background="#FFFFE0"/> + </android.support.v4.widget.DrawerLayout> <LinearLayout android:id="@+id/progressBarView" @@ -60,4 +77,4 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> </LinearLayout> -</FrameLayout>
\ No newline at end of file +</FrameLayout> diff --git a/src/ui/android/res/layout/lexical_item.xml b/src/ui/android/res/layout/lexical_item.xml index e7f551491..1d3835e54 100644 --- a/src/ui/android/res/layout/lexical_item.xml +++ b/src/ui/android/res/layout/lexical_item.xml @@ -18,10 +18,10 @@ android:layout_toRightOf="@id/arrow" android:paddingLeft="10dp" android:textSize="25sp"/> - + <WebView android:id="@+id/desc_details" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@id/lexical_desc"/> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/src/ui/android/res/menu/main.xml b/src/ui/android/res/menu/main.xml index 7f5a4c4f7..b1ba5f268 100644 --- a/src/ui/android/res/menu/main.xml +++ b/src/ui/android/res/menu/main.xml @@ -1,6 +1,8 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" > <item android:id="@+id/input_mode" android:title="@string/keyboard_input"/> + <item android:id="@+id/topics" + android:title="@string/topics"/> <item android:id="@+id/help" android:title="@string/help"/> </menu> diff --git a/src/ui/android/res/values/strings.xml b/src/ui/android/res/values/strings.xml index a4d02295d..3b9f828b2 100644 --- a/src/ui/android/res/values/strings.xml +++ b/src/ui/android/res/values/strings.xml @@ -29,4 +29,8 @@ <string name="search_hint">Search word:</string> <string name="search_description">Search for words in the lexicon</string> + + <string name="topics">Topics</string> + <string name="topics_open">Open topics</string> + <string name="topics_close">Close topics</string> </resources> |
