the Android UI uses a new progress indicator which works on both Nexus 1 and Nexus 7

This commit is contained in:
kr.angelov
2014-02-25 09:46:05 +00:00
parent 95a2ebe569
commit 889afe32e3
4 changed files with 155 additions and 167 deletions

View File

@@ -1,48 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="match_parent"
>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
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_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_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:padding="0dp"
/>
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"
android:layout_height="match_parent"
android:layout_below="@id/lexical_desc"
android:orientation="vertical"
android:paddingLeft="1dp"
android:id="@android:id/list" >
</ListView>
</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>

View File

@@ -1,83 +1,91 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="match_parent"
>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="match_parent">
<RelativeLayout
android:id="@+id/top_bg"
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/start_stop"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_alignTop="@+id/source_language"
android:layout_alignBottom="@+id/target_language"
android:layout_alignParentRight="true"
android:padding="8dp"
android:src="@drawable/ic_mic"
android:contentDescription="@string/microphone"
/>
<ImageView
android:id="@+id/switch_languages"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_alignTop="@+id/source_language"
android:layout_alignBottom="@+id/target_language"
android:layout_toLeftOf="@id/start_stop"
android:padding="8dp"
android:src="@drawable/ic_action_switch"
android:contentDescription="@string/switch_languages"
/>
<org.grammaticalframework.ui.android.LanguageSelector
android:id="@+id/source_language"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_toLeftOf="@id/switch_languages"
android:padding="0dp"
/>
<org.grammaticalframework.ui.android.LanguageSelector
android:id="@+id/target_language"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_below="@id/source_language"
android:layout_toLeftOf="@id/switch_languages"
android:padding="0dp"
/>
</RelativeLayout>
<org.grammaticalframework.ui.android.ConversationView
android:id="@+id/conversation"
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/top_bg"
>
<LinearLayout
android:id="@+id/conversation_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical"
android:padding="16dp"
>
</LinearLayout>
</org.grammaticalframework.ui.android.ConversationView>
</RelativeLayout>
android:layout_height="match_parent"
android:layout_width="match_parent">
<RelativeLayout
android:id="@+id/top_bg"
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/start_stop"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_alignTop="@+id/source_language"
android:layout_alignBottom="@+id/target_language"
android:layout_alignParentRight="true"
android:padding="8dp"
android:src="@drawable/ic_mic"
android:contentDescription="@string/microphone"/>
<ImageView
android:id="@+id/switch_languages"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_alignTop="@+id/source_language"
android:layout_alignBottom="@+id/target_language"
android:layout_toLeftOf="@id/start_stop"
android:padding="8dp"
android:src="@drawable/ic_action_switch"
android:contentDescription="@string/switch_languages"/>
<org.grammaticalframework.ui.android.LanguageSelector
android:id="@+id/source_language"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_toLeftOf="@id/switch_languages"
android:padding="0dp"/>
<org.grammaticalframework.ui.android.LanguageSelector
android:id="@+id/target_language"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_below="@id/source_language"
android:layout_toLeftOf="@id/switch_languages"
android:padding="0dp"/>
</RelativeLayout>
<org.grammaticalframework.ui.android.ConversationView
android:id="@+id/conversation"
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/top_bg">
<LinearLayout
android:id="@+id/conversation_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical"
android:padding="16dp"/>
</org.grammaticalframework.ui.android.ConversationView>
</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>