msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

majour redesign of the Phrasebook UI to support recursive phrases

Browse Source
This commit is contained in:
krasimir
2016-05-30 23:24:17 +00:00
parent ed1e60f633
commit 194368dfd5
34 changed files with 1108 additions and 2356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ui/android/res/layout/advanced_options_button.xml
View File

@@ -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>

81
src/ui/android/res/layout/fragment_translator.xml
View File

@@ -6,42 +6,55 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<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">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/containerfor_translation"
android:layout_marginLeft="0dp"
android:layout_marginTop="0dp">
<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"
/>
</FrameLayout>
<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"
/>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/containerfor_options"
android:layout_marginLeft="0dp"
android:layout_marginTop="0dp">
<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>
<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>
<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>

0
src/ui/android/res/layout/small_fragment_number.xml → src/ui/android/res/layout/number_input_list_item.xml
View File

16
src/ui/android/res/layout/small_fragment_input_holder.xml
View File

@@ -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>

59
src/ui/android/res/layout/small_fragment_options.xml
View File

@@ -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>

15
src/ui/android/res/layout/small_fragment_swipe.xml
View File

@@ -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>

45
src/ui/android/res/layout/small_fragment_translation.xml
View File

@@ -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>

5
src/ui/android/res/layout/small_fragment_spinner.xml → src/ui/android/res/layout/spinner_input_list_item.xml
View File

@@ -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>
</LinearLayout>