diff options
| author | John J. Camilleri <john@digitalgrammars.com> | 2018-11-28 14:47:20 +0100 |
|---|---|---|
| committer | John J. Camilleri <john@digitalgrammars.com> | 2018-11-28 14:47:20 +0100 |
| commit | 6352799ccb7d7b9c7d006fd1149b1a977f78e9b3 (patch) | |
| tree | b4db91f52d0c0777be3ff92ca1beb3b8c0bab91c /src/ui/android/res/layout/activity_main.xml | |
| parent | b1611eccd82fa28d3a701a87291dc8d83537071e (diff) | |
| parent | a45c735545052501e53ecccfa33d0c3e42cc25fd (diff) | |
Merge branch 'master' into new-website
# Conflicts:
# index.html
Diffstat (limited to 'src/ui/android/res/layout/activity_main.xml')
| -rw-r--r-- | src/ui/android/res/layout/activity_main.xml | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/src/ui/android/res/layout/activity_main.xml b/src/ui/android/res/layout/activity_main.xml deleted file mode 100644 index b77fe5857..000000000 --- a/src/ui/android/res/layout/activity_main.xml +++ /dev/null @@ -1,91 +0,0 @@ -<?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/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>
\ No newline at end of file |