diff options
Diffstat (limited to 'src/ui/android/res')
| -rw-r--r-- | src/ui/android/res/layout/advanced_options_button.xml | 13 | ||||
| -rw-r--r-- | src/ui/android/res/layout/fragment_translator.xml | 89 | ||||
| -rw-r--r-- | src/ui/android/res/layout/number_input_list_item.xml (renamed from src/ui/android/res/layout/small_fragment_number.xml) | 0 | ||||
| -rw-r--r-- | src/ui/android/res/layout/small_fragment_input_holder.xml | 16 | ||||
| -rw-r--r-- | src/ui/android/res/layout/small_fragment_options.xml | 59 | ||||
| -rw-r--r-- | src/ui/android/res/layout/small_fragment_swipe.xml | 15 | ||||
| -rw-r--r-- | src/ui/android/res/layout/small_fragment_translation.xml | 45 | ||||
| -rw-r--r-- | src/ui/android/res/layout/spinner_input_list_item.xml (renamed from src/ui/android/res/layout/small_fragment_spinner.xml) | 5 |
8 files changed, 53 insertions, 189 deletions
diff --git a/src/ui/android/res/layout/advanced_options_button.xml b/src/ui/android/res/layout/advanced_options_button.xml deleted file mode 100644 index 140dfebb9..000000000 --- a/src/ui/android/res/layout/advanced_options_button.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <CheckBox - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Activate Advanced Options" - android:id="@+id/checkBox" /> - -</LinearLayout>
\ No newline at end of file diff --git a/src/ui/android/res/layout/fragment_translator.xml b/src/ui/android/res/layout/fragment_translator.xml index 5cf529846..6b6584f98 100644 --- a/src/ui/android/res/layout/fragment_translator.xml +++ b/src/ui/android/res/layout/fragment_translator.xml @@ -6,42 +6,55 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/containerfor_translation" - android:layout_marginLeft="0dp" - android:layout_marginTop="0dp"> - - </FrameLayout> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:id="@+id/containerfor_options" - android:layout_marginLeft="0dp" - android:layout_marginTop="0dp"> - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/dots" - android:orientation="horizontal" - android:gravity="center_vertical" - android:layout_gravity="center|bottom"> - - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/firstDot" - android:src="@drawable/ic_dictionary" /> - - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/secondDot" - android:src="@drawable/ic_dictionary" /> - </LinearLayout> - </FrameLayout> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/grid_phrasebook_button" + android:layout_marginTop="10dp" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:id="@+id/fragment_translation"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="New Text" + android:textSize="24dp" + android:id="@+id/origin_phrase" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" + android:maxLines="4" + android:scrollHorizontally="false" + /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="New Text" + android:textSize="24dp" + android:id="@+id/target_phrase" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:maxLines="4" + android:scrollHorizontally="false" + /> + + <ImageView + android:id="@+id/button3" + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_gravity="right" + android:src="@drawable/ic_volume_up_black_18dp"/> + </LinearLayout> + + <ListView xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/input_holder" + android:divider="@android:color/transparent" + android:padding="8dp"/> </LinearLayout> diff --git a/src/ui/android/res/layout/small_fragment_number.xml b/src/ui/android/res/layout/number_input_list_item.xml index a3cfa07e5..a3cfa07e5 100644 --- a/src/ui/android/res/layout/small_fragment_number.xml +++ b/src/ui/android/res/layout/number_input_list_item.xml diff --git a/src/ui/android/res/layout/small_fragment_input_holder.xml b/src/ui/android/res/layout/small_fragment_input_holder.xml deleted file mode 100644 index a197ffbf5..000000000 --- a/src/ui/android/res/layout/small_fragment_input_holder.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent" - android:id="@+id/input_holder" - android:padding="8dp" - > - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="New Text" - android:textSize="25dp" - android:id="@+id/holderOptionText" /> - -</LinearLayout>
\ No newline at end of file diff --git a/src/ui/android/res/layout/small_fragment_options.xml b/src/ui/android/res/layout/small_fragment_options.xml deleted file mode 100644 index bfd69e16f..000000000 --- a/src/ui/android/res/layout/small_fragment_options.xml +++ /dev/null @@ -1,59 +0,0 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="16dp" - tools:context=".gui.smallFragments.OptionsFragment" - > - - <ScrollView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:id="@+id/scrollView" > - - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/child_fragment1"> - </FrameLayout> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/child_fragment2"> - </FrameLayout> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/child_fragment3"> - </FrameLayout> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/child_fragment4"> - </FrameLayout> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/child_fragment5"> - </FrameLayout> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/child_fragment6"> - </FrameLayout> - </LinearLayout> - </ScrollView> - - -</LinearLayout> diff --git a/src/ui/android/res/layout/small_fragment_swipe.xml b/src/ui/android/res/layout/small_fragment_swipe.xml deleted file mode 100644 index 25fd8113d..000000000 --- a/src/ui/android/res/layout/small_fragment_swipe.xml +++ /dev/null @@ -1,15 +0,0 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".gui.smallFragments.SwipeFragment" - android:id="@+id/fragment_swipe"> - - - <android.support.v4.view.ViewPager - android:id="@+id/vpPager" - android:layout_width="match_parent" - android:layout_height="match_parent"> - </android.support.v4.view.ViewPager> - -</FrameLayout> diff --git a/src/ui/android/res/layout/small_fragment_translation.xml b/src/ui/android/res/layout/small_fragment_translation.xml deleted file mode 100644 index cc4d49053..000000000 --- a/src/ui/android/res/layout/small_fragment_translation.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/grid_phrasebook_button" - android:layout_marginTop="10dp" - android:layout_marginLeft="10dp" - android:layout_marginRight="10dp" - android:id="@+id/fragment_translation"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="New Text" - android:textSize="24dp" - android:id="@+id/origin_phrase" - android:layout_marginLeft="10dp" - android:layout_marginRight="10dp" - android:layout_marginTop="16dp" - android:layout_marginBottom="16dp" - android:maxLines="4" - android:scrollHorizontally="false" - /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="New Text" - android:textSize="24dp" - android:id="@+id/target_phrase" - android:layout_marginLeft="10dp" - android:layout_marginRight="10dp" - android:maxLines="4" - android:scrollHorizontally="false" - /> - - <ImageView - android:id="@+id/button3" - android:layout_width="30dp" - android:layout_height="30dp" - android:layout_gravity="right" - android:src="@drawable/ic_volume_up_black_18dp"/> - -</LinearLayout> diff --git a/src/ui/android/res/layout/small_fragment_spinner.xml b/src/ui/android/res/layout/spinner_input_list_item.xml index acb7caac2..be07004f4 100644 --- a/src/ui/android/res/layout/small_fragment_spinner.xml +++ b/src/ui/android/res/layout/spinner_input_list_item.xml @@ -2,8 +2,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent" - android:id="@+id/spinner_input"> + android:layout_height="wrap_content"> <TextView android:layout_width="wrap_content" @@ -17,4 +16,4 @@ android:layout_height="wrap_content" android:id="@+id/choice_spinner" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> |