Skip to content

Commit e5c89c0

Browse files
Pratham2305Pratham2305
authored
Fixed two item was inaccessable with bottom sheet in landscape mode. (commons-app#4187)
scrollview is added so that last options are scrollable.
1 parent 93cd89a commit e5c89c0

File tree

2 files changed

+154
-124
lines changed

2 files changed

+154
-124
lines changed

‎app/src/main/res/layout/fragment_more_bottom_sheet.xml

Lines changed: 85 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -5,80 +5,95 @@
55
android:theme="?attr/more_bottom_sheet_style"
66
android:orientation="vertical">
77

8-
<TextView
9-
android:id="@+id/more_profile"
10-
android:layout_width="match_parent"
11-
android:layout_height="wrap_content"
12-
android:layout_margin="12dp"
13-
android:drawableStart="@drawable/ic_person_black_24dp"
14-
android:drawablePadding="12dp"
15-
android:padding="8dp"
16-
android:text="@string/Profile"
17-
android:textSize="18sp" />
8+
<ScrollView
9+
android:layout_width="match_parent"
10+
android:layout_height="match_parent"
11+
android:nestedScrollingEnabled="true">
1812

19-
<TextView
20-
android:id="@+id/more_peer_review"
21-
android:layout_width="match_parent"
22-
android:layout_height="wrap_content"
23-
android:layout_margin="12dp"
24-
android:drawableStart="@drawable/ic_check_black_24dp"
25-
android:drawablePadding="12dp"
26-
android:padding="8dp"
27-
android:text="@string/navigation_item_review"
28-
android:textSize="18sp" />
13+
<LinearLayout
14+
android:layout_width="match_parent"
15+
android:layout_height="wrap_content"
16+
android:orientation="vertical">
2917

30-
<TextView
31-
android:id="@+id/more_settings"
32-
android:layout_width="match_parent"
33-
android:layout_height="wrap_content"
34-
android:layout_margin="12dp"
35-
android:drawableStart="@drawable/ic_settings_black_24dp"
36-
android:drawablePadding="12dp"
37-
android:padding="8dp"
38-
android:text="@string/menu_settings"
39-
android:textSize="18sp" />
18+
<TextView
19+
android:id="@+id/more_profile"
20+
android:layout_width="match_parent"
21+
android:layout_height="wrap_content"
22+
android:layout_margin="12dp"
23+
android:drawableStart="@drawable/ic_person_black_24dp"
24+
android:drawablePadding="12dp"
25+
android:padding="8dp"
26+
android:text="@string/Profile"
27+
android:textSize="18sp" />
4028

41-
<TextView
42-
android:id="@+id/more_tutorial"
43-
android:layout_width="match_parent"
44-
android:layout_height="wrap_content"
45-
android:layout_margin="12dp"
46-
android:drawableStart="@drawable/ic_help_black_24dp"
47-
android:drawablePadding="12dp"
48-
android:padding="8dp"
49-
android:text="@string/navigation_item_info"
50-
android:textSize="18sp" />
29+
<TextView
30+
android:id="@+id/more_peer_review"
31+
android:layout_width="match_parent"
32+
android:layout_height="wrap_content"
33+
android:layout_margin="12dp"
34+
android:drawableStart="@drawable/ic_check_black_24dp"
35+
android:drawablePadding="12dp"
36+
android:padding="8dp"
37+
android:text="@string/navigation_item_review"
38+
android:textSize="18sp" />
5139

52-
<TextView
53-
android:id="@+id/more_feedback"
54-
android:layout_width="match_parent"
55-
android:layout_height="wrap_content"
56-
android:layout_margin="12dp"
57-
android:drawableLeft="@drawable/ic_feedback_black_24dp"
58-
android:drawablePadding="12dp"
59-
android:padding="8dp"
60-
android:text="@string/navigation_item_feedback"
61-
android:textSize="18sp" />
40+
<TextView
41+
android:id="@+id/more_settings"
42+
android:layout_width="match_parent"
43+
android:layout_height="wrap_content"
44+
android:layout_margin="12dp"
45+
android:drawableStart="@drawable/ic_settings_black_24dp"
46+
android:drawablePadding="12dp"
47+
android:padding="8dp"
48+
android:text="@string/menu_settings"
49+
android:textSize="18sp" />
6250

63-
<TextView
64-
android:id="@+id/more_about"
65-
android:layout_width="match_parent"
66-
android:layout_height="wrap_content"
67-
android:layout_margin="12dp"
68-
android:drawableStart="@drawable/ic_info_outline_24dp"
69-
android:drawablePadding="12dp"
70-
android:padding="8dp"
71-
android:text="@string/navigation_item_about"
72-
android:textSize="18sp" />
51+
<TextView
52+
android:id="@+id/more_tutorial"
53+
android:layout_width="match_parent"
54+
android:layout_height="wrap_content"
55+
android:layout_margin="12dp"
56+
android:drawableStart="@drawable/ic_help_black_24dp"
57+
android:drawablePadding="12dp"
58+
android:padding="8dp"
59+
android:text="@string/navigation_item_info"
60+
android:textSize="18sp" />
61+
62+
<TextView
63+
android:id="@+id/more_feedback"
64+
android:layout_width="match_parent"
65+
android:layout_height="wrap_content"
66+
android:layout_margin="12dp"
67+
android:drawableLeft="@drawable/ic_feedback_black_24dp"
68+
android:drawablePadding="12dp"
69+
android:padding="8dp"
70+
android:text="@string/navigation_item_feedback"
71+
android:textSize="18sp" />
72+
73+
<TextView
74+
android:id="@+id/more_about"
75+
android:layout_width="match_parent"
76+
android:layout_height="wrap_content"
77+
android:layout_margin="12dp"
78+
android:drawableStart="@drawable/ic_info_outline_24dp"
79+
android:drawablePadding="12dp"
80+
android:padding="8dp"
81+
android:text="@string/navigation_item_about"
82+
android:textSize="18sp" />
83+
84+
<TextView
85+
android:id="@+id/more_logout"
86+
android:layout_width="match_parent"
87+
android:layout_height="wrap_content"
88+
android:layout_margin="12dp"
89+
android:drawableStart="@drawable/ic_exit_to_app_black_24dp"
90+
android:drawablePadding="12dp"
91+
android:padding="8dp"
92+
android:text="@string/navigation_item_logout"
93+
android:textSize="18sp" />
94+
95+
</LinearLayout>
96+
97+
</ScrollView>
7398

74-
<TextView
75-
android:id="@+id/more_logout"
76-
android:layout_width="match_parent"
77-
android:layout_height="wrap_content"
78-
android:layout_margin="12dp"
79-
android:drawableStart="@drawable/ic_exit_to_app_black_24dp"
80-
android:drawablePadding="12dp"
81-
android:padding="8dp"
82-
android:text="@string/navigation_item_logout"
83-
android:textSize="18sp" />
8499
</LinearLayout>

‎app/src/main/res/layout/fragment_more_bottom_sheet_logged_out.xml

Lines changed: 69 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -5,58 +5,73 @@
55
android:theme="?attr/more_bottom_sheet_style"
66
android:orientation="vertical">
77

8-
<TextView
9-
android:id="@+id/more_settings"
10-
android:layout_width="match_parent"
11-
android:layout_height="wrap_content"
12-
android:layout_margin="12dp"
13-
android:drawableStart="@drawable/ic_settings_black_24dp"
14-
android:drawablePadding="12dp"
15-
android:padding="8dp"
16-
android:text="@string/menu_settings"
17-
android:textSize="18sp" />
18-
19-
<TextView
20-
android:id="@+id/more_tutorial"
21-
android:layout_width="match_parent"
22-
android:layout_height="wrap_content"
23-
android:layout_margin="12dp"
24-
android:drawableStart="@drawable/ic_help_black_24dp"
25-
android:drawablePadding="12dp"
26-
android:padding="8dp"
27-
android:text="@string/navigation_item_info"
28-
android:textSize="18sp" />
29-
30-
<TextView
31-
android:id="@+id/more_feedback"
32-
android:layout_width="match_parent"
33-
android:layout_height="wrap_content"
34-
android:layout_margin="12dp"
35-
android:drawableLeft="@drawable/ic_feedback_black_24dp"
36-
android:drawablePadding="12dp"
37-
android:padding="8dp"
38-
android:text="@string/navigation_item_feedback"
39-
android:textSize="18sp" />
40-
41-
<TextView
42-
android:id="@+id/more_about"
43-
android:layout_width="match_parent"
44-
android:layout_height="wrap_content"
45-
android:layout_margin="12dp"
46-
android:drawableStart="@drawable/ic_info_outline_24dp"
47-
android:drawablePadding="12dp"
48-
android:padding="8dp"
49-
android:text="@string/navigation_item_about"
50-
android:textSize="18sp" />
51-
52-
<TextView
53-
android:id="@+id/more_login"
54-
android:layout_width="match_parent"
55-
android:layout_height="wrap_content"
56-
android:layout_margin="12dp"
57-
android:drawableStart="@drawable/ic_baseline_person_24"
58-
android:drawablePadding="12dp"
59-
android:padding="8dp"
60-
android:text="@string/navigation_item_login"
61-
android:textSize="18sp" />
8+
<ScrollView
9+
android:layout_width="match_parent"
10+
android:layout_height="match_parent"
11+
android:nestedScrollingEnabled="true">
12+
13+
<LinearLayout
14+
android:layout_width="match_parent"
15+
android:layout_height="wrap_content"
16+
android:orientation="vertical" >
17+
18+
<TextView
19+
android:id="@+id/more_settings"
20+
android:layout_width="match_parent"
21+
android:layout_height="wrap_content"
22+
android:layout_margin="12dp"
23+
android:drawableStart="@drawable/ic_settings_black_24dp"
24+
android:drawablePadding="12dp"
25+
android:padding="8dp"
26+
android:text="@string/menu_settings"
27+
android:textSize="18sp" />
28+
29+
<TextView
30+
android:id="@+id/more_tutorial"
31+
android:layout_width="match_parent"
32+
android:layout_height="wrap_content"
33+
android:layout_margin="12dp"
34+
android:drawableStart="@drawable/ic_help_black_24dp"
35+
android:drawablePadding="12dp"
36+
android:padding="8dp"
37+
android:text="@string/navigation_item_info"
38+
android:textSize="18sp" />
39+
40+
<TextView
41+
android:id="@+id/more_feedback"
42+
android:layout_width="match_parent"
43+
android:layout_height="wrap_content"
44+
android:layout_margin="12dp"
45+
android:drawableLeft="@drawable/ic_feedback_black_24dp"
46+
android:drawablePadding="12dp"
47+
android:padding="8dp"
48+
android:text="@string/navigation_item_feedback"
49+
android:textSize="18sp" />
50+
51+
<TextView
52+
android:id="@+id/more_about"
53+
android:layout_width="match_parent"
54+
android:layout_height="wrap_content"
55+
android:layout_margin="12dp"
56+
android:drawableStart="@drawable/ic_info_outline_24dp"
57+
android:drawablePadding="12dp"
58+
android:padding="8dp"
59+
android:text="@string/navigation_item_about"
60+
android:textSize="18sp" />
61+
62+
<TextView
63+
android:id="@+id/more_login"
64+
android:layout_width="match_parent"
65+
android:layout_height="wrap_content"
66+
android:layout_margin="12dp"
67+
android:drawableStart="@drawable/ic_baseline_person_24"
68+
android:drawablePadding="12dp"
69+
android:padding="8dp"
70+
android:text="@string/navigation_item_login"
71+
android:textSize="18sp" />
72+
73+
</LinearLayout>
74+
75+
</ScrollView>
76+
6277
</LinearLayout>

0 commit comments

Comments
 (0)