Skip to content

Commit b27fe5f

Browse files
author
Daniil Efremov
authored
Merge pull request #75 from dividiti/issue-74
Landscape orientation for result screen #74
2 parents c329af6 + 5681d7e commit b27fe5f

File tree

3 files changed

+481
-0
lines changed

3 files changed

+481
-0
lines changed

‎app/src/main/res/layout-land/activity_result.xml‎

Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:id="@+id/activity_result"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
android:background="@color/colorBackground"
8+
tools:context="openscience.crowdsource.video.experiments.ResultActivity">
9+
10+
<!-- header -->
11+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
12+
android:layout_width="fill_parent"
13+
android:layout_height="wrap_content"
14+
android:orientation="horizontal"
15+
android:background="@color/colorBackground"
16+
android:layout_margin="30dp"
17+
android:id="@+id/topSelectedScenario"
18+
>
19+
<TextView
20+
android:id="@+id/topSelectedScenarioText"
21+
android:layout_marginRight="50dp"
22+
android:layout_width="wrap_content"
23+
android:textColor="@color/colorTextWhite"
24+
android:textSize="20sp"
25+
android:text="Select scenario"
26+
android:layout_height="wrap_content"/>
27+
28+
<ImageView
29+
android:id="@+id/ico_scenarioInfo"
30+
android:layout_width="wrap_content"
31+
android:layout_height="wrap_content"
32+
android:layout_alignParentRight="true"
33+
android:layout_alignEnd="@+id/scenario"
34+
android:src="@drawable/abc_ic_ab_back_mtrl_am_alpha"/>
35+
</RelativeLayout>
36+
37+
<View android:id="@+id/line_scenario"
38+
android:layout_height="1dp"
39+
android:layout_width="fill_parent"
40+
android:background="#000000"
41+
android:layout_marginTop="0dp"
42+
android:layout_below="@id/topSelectedScenario"
43+
/>
44+
45+
<ScrollView
46+
android:layout_height="fill_parent"
47+
android:layout_margin="30dp"
48+
android:layout_width="match_parent"
49+
android:layout_centerHorizontal="true"
50+
android:orientation="vertical"
51+
android:layout_below="@id/line_scenario"
52+
>
53+
<RelativeLayout
54+
android:layout_width="fill_parent"
55+
android:layout_height="fill_parent"
56+
android:orientation="vertical">
57+
58+
<ImageView
59+
android:id="@+id/imageView1"
60+
android:layout_width="300dp"
61+
android:layout_height="300dp"
62+
android:layout_marginTop="0dp"
63+
android:layout_marginLeft="0dp"
64+
android:background="@color/colorImageViewBackground"
65+
android:adjustViewBounds="true"
66+
android:scaleType="centerCrop"
67+
/>
68+
<RelativeLayout
69+
android:layout_height="fill_parent"
70+
android:layout_width="match_parent"
71+
android:orientation="vertical"
72+
73+
android:layout_marginTop="0dp"
74+
android:layout_marginLeft="30dp"
75+
android:layout_marginRight="30dp"
76+
android:layout_marginBottom="80dp"
77+
78+
android:layout_below="@id/s_scenario"
79+
android:layout_toRightOf="@+id/imageView1"
80+
>
81+
<TextView
82+
android:id="@+id/crowdResultURL"
83+
android:text="View result"
84+
android:textColor="@color/colorTextGreen"
85+
android:layout_width="wrap_content"
86+
android:layout_height="wrap_content"
87+
android:layout_marginLeft="0dp"
88+
android:minHeight="28dp"
89+
android:textSize="14sp"
90+
/>
91+
<TextView
92+
android:id="@+id/predictedResultLabel"
93+
android:text="The most likely prediction:"
94+
android:textColor="@color/colorTextGreen"
95+
android:layout_width="wrap_content"
96+
android:layout_height="wrap_content"
97+
android:layout_marginTop="10dp"
98+
android:layout_marginLeft="0dp"
99+
android:layout_below="@+id/crowdResultURL"
100+
android:minHeight="28dp"
101+
android:textSize="14sp"
102+
/>
103+
104+
<TextView
105+
android:id="@+id/predictedResultValue"
106+
android:text="predictedResultValue"
107+
android:textColor="@color/colorTextWhite"
108+
android:layout_width="wrap_content"
109+
android:layout_height="wrap_content"
110+
android:layout_marginTop="0dp"
111+
android:layout_marginLeft="0dp"
112+
android:layout_below="@+id/predictedResultLabel"
113+
android:minHeight="28dp"
114+
android:textSize="14sp"
115+
/>
116+
117+
<TextView
118+
android:id="@+id/selectResultText"
119+
android:text="If the prediction is wrong, please select another one from below or suggest your own:"
120+
android:textColor="@color/colorTextGreen"
121+
android:layout_width="wrap_content"
122+
android:layout_height="wrap_content"
123+
android:layout_marginTop="10dp"
124+
android:layout_marginLeft="0dp"
125+
android:layout_below="@+id/predictedResultValue"
126+
android:minHeight="28dp"
127+
android:textSize="14sp"
128+
/>
129+
130+
<RadioGroup
131+
android:id="@+id/rgSelectResultList"
132+
android:orientation="vertical"
133+
android:textColor="@color/colorTextWhite"
134+
android:layout_width="match_parent"
135+
android:layout_height="wrap_content"
136+
android:layout_marginTop="0dp"
137+
android:layout_marginLeft="0dp"
138+
android:layout_marginBottom="30dp"
139+
android:layout_below="@+id/selectResultText"
140+
android:layout_alignParentLeft="true"
141+
android:minHeight="28dp"
142+
android:textSize="20sp"
143+
/>
144+
145+
<Button
146+
android:id="@+id/b_back"
147+
android:text="Back"
148+
android:textColor="@color/colorTextWhite"
149+
android:textSize="18dp"
150+
151+
android:layout_width="112dp"
152+
android:background="@drawable/b_recognize_enabled"
153+
android:layout_height="56dp"
154+
android:layout_marginTop="0dp"
155+
android:layout_marginLeft="0dp"
156+
android:layout_marginRight="0dp"
157+
android:layout_below="@+id/rgSelectResultList"
158+
android:layout_centerHorizontal="true"
159+
/>
160+
</RelativeLayout>
161+
</RelativeLayout>
162+
</ScrollView>
163+
</RelativeLayout>
164+

‎app/src/main/res/layout-large-land/activity_result.xml‎

Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:id="@+id/activity_result"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
android:background="@color/colorBackground"
8+
tools:context="openscience.crowdsource.video.experiments.ResultActivity">
9+
10+
<!-- header -->
11+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
12+
android:layout_width="fill_parent"
13+
android:layout_height="wrap_content"
14+
android:orientation="horizontal"
15+
android:background="@color/colorBackground"
16+
android:layout_margin="30dp"
17+
android:id="@+id/topSelectedScenario"
18+
>
19+
<TextView
20+
android:id="@+id/topSelectedScenarioText"
21+
android:layout_marginRight="50dp"
22+
android:layout_width="wrap_content"
23+
android:textColor="@color/colorTextWhite"
24+
android:textSize="20sp"
25+
android:text="Select scenario"
26+
android:layout_height="wrap_content"/>
27+
28+
<ImageView
29+
android:id="@+id/ico_scenarioInfo"
30+
android:layout_width="wrap_content"
31+
android:layout_height="wrap_content"
32+
android:layout_alignParentRight="true"
33+
android:layout_alignEnd="@+id/scenario"
34+
android:src="@drawable/abc_ic_ab_back_mtrl_am_alpha"/>
35+
</RelativeLayout>
36+
37+
<View android:id="@+id/line_scenario"
38+
android:layout_height="1dp"
39+
android:layout_width="fill_parent"
40+
android:background="#000000"
41+
android:layout_marginTop="0dp"
42+
android:layout_below="@id/topSelectedScenario"
43+
/>
44+
45+
<ScrollView
46+
android:layout_height="fill_parent"
47+
android:layout_margin="30dp"
48+
android:layout_width="match_parent"
49+
android:layout_centerHorizontal="true"
50+
android:orientation="vertical"
51+
android:layout_below="@id/line_scenario"
52+
>
53+
<RelativeLayout
54+
android:layout_width="fill_parent"
55+
android:layout_height="fill_parent"
56+
android:orientation="vertical">
57+
58+
<ImageView
59+
android:id="@+id/imageView1"
60+
android:layout_width="500dp"
61+
android:layout_height="500dp"
62+
android:layout_marginTop="0dp"
63+
android:layout_marginLeft="0dp"
64+
android:background="@color/colorImageViewBackground"
65+
android:adjustViewBounds="true"
66+
android:scaleType="centerCrop"
67+
/>
68+
<RelativeLayout
69+
android:layout_height="fill_parent"
70+
android:layout_width="match_parent"
71+
android:orientation="vertical"
72+
73+
android:layout_marginTop="0dp"
74+
android:layout_marginLeft="30dp"
75+
android:layout_marginRight="30dp"
76+
android:layout_marginBottom="80dp"
77+
78+
android:layout_below="@id/s_scenario"
79+
android:layout_toRightOf="@+id/imageView1"
80+
>
81+
<TextView
82+
android:id="@+id/crowdResultURL"
83+
android:text="View result"
84+
android:textColor="@color/colorTextGreen"
85+
android:layout_width="wrap_content"
86+
android:layout_height="wrap_content"
87+
android:layout_marginLeft="0dp"
88+
android:minHeight="28dp"
89+
android:textSize="14sp"
90+
/>
91+
<TextView
92+
android:id="@+id/predictedResultLabel"
93+
android:text="The most likely prediction:"
94+
android:textColor="@color/colorTextGreen"
95+
android:layout_width="wrap_content"
96+
android:layout_height="wrap_content"
97+
android:layout_marginTop="10dp"
98+
android:layout_marginLeft="0dp"
99+
android:layout_below="@+id/crowdResultURL"
100+
android:minHeight="28dp"
101+
android:textSize="14sp"
102+
/>
103+
104+
<TextView
105+
android:id="@+id/predictedResultValue"
106+
android:text="predictedResultValue"
107+
android:textColor="@color/colorTextWhite"
108+
android:layout_width="wrap_content"
109+
android:layout_height="wrap_content"
110+
android:layout_marginTop="0dp"
111+
android:layout_marginLeft="0dp"
112+
android:layout_below="@+id/predictedResultLabel"
113+
android:minHeight="28dp"
114+
android:textSize="14sp"
115+
/>
116+
117+
<TextView
118+
android:id="@+id/selectResultText"
119+
android:text="If the prediction is wrong, please select another one from below or suggest your own:"
120+
android:textColor="@color/colorTextGreen"
121+
android:layout_width="wrap_content"
122+
android:layout_height="wrap_content"
123+
android:layout_marginTop="10dp"
124+
android:layout_marginLeft="0dp"
125+
android:layout_below="@+id/predictedResultValue"
126+
android:minHeight="28dp"
127+
android:textSize="14sp"
128+
/>
129+
130+
<RadioGroup
131+
android:id="@+id/rgSelectResultList"
132+
android:orientation="vertical"
133+
android:textColor="@color/colorTextWhite"
134+
android:layout_width="match_parent"
135+
android:layout_height="wrap_content"
136+
android:layout_marginTop="0dp"
137+
android:layout_marginLeft="0dp"
138+
android:layout_marginBottom="30dp"
139+
android:layout_below="@+id/selectResultText"
140+
android:layout_alignParentLeft="true"
141+
android:minHeight="28dp"
142+
android:textSize="20sp"
143+
/>
144+
145+
<Button
146+
android:id="@+id/b_back"
147+
android:text="Back"
148+
android:textColor="@color/colorTextWhite"
149+
android:textSize="18dp"
150+
151+
android:layout_width="112dp"
152+
android:background="@drawable/b_recognize_enabled"
153+
android:layout_height="56dp"
154+
android:layout_marginTop="0dp"
155+
android:layout_marginLeft="0dp"
156+
android:layout_marginRight="0dp"
157+
android:layout_below="@+id/rgSelectResultList"
158+
android:layout_centerHorizontal="true"
159+
/>
160+
</RelativeLayout>
161+
</RelativeLayout>
162+
</ScrollView>
163+
</RelativeLayout>
164+

0 commit comments

Comments
 (0)