Skip to content

Commit 105e5d7

Browse files
vanshikaaroramaskaravivek
vanshikaarora
authored and
maskaravivek
committed
Made nearby notification also visible to right-to-left languages (commons-app#2365)
* Fixed Issue commons-app#2334 * resolved gradle changes * changed gragle.wrapper
1 parent b244e40 commit 105e5d7

File tree

2 files changed

+66
-67
lines changed

2 files changed

+66
-67
lines changed

‎app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import android.view.View;
88
import android.widget.Button;
99
import android.widget.ImageView;
10+
import android.widget.LinearLayout;
1011
import android.widget.ProgressBar;
1112
import android.widget.RelativeLayout;
1213
import android.widget.TextView;
@@ -25,7 +26,7 @@ public class NearbyNotificationCardView extends SwipableCardView {
2526
private Context context;
2627

2728
private Button permissionRequestButton;
28-
private RelativeLayout contentLayout;
29+
private LinearLayout contentLayout;
2930
private TextView notificationTitle;
3031
private TextView notificationDistance;
3132
private ImageView notificationIcon;

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

+64-66
Original file line numberDiff line numberDiff line change
@@ -7,90 +7,88 @@
77
android:layout_centerVertical="true"
88
android:minHeight="72dp">
99

10-
<Button
10+
<Button
11+
android:layout_width="wrap_content"
12+
android:layout_height="wrap_content"
13+
android:id="@+id/permission_request_button"
14+
android:text="@string/display_nearby_notification_summary"
15+
android:layout_centerInParent="true"
16+
android:layout_marginLeft="8dp"
17+
android:layout_marginRight="8dp"
18+
android:layout_marginTop="8dp"
19+
android:minWidth="48dp"
20+
android:textColor="@android:color/white"
21+
android:singleLine="true"
22+
android:theme="?attr/mainScreenNearbyPermissionbutton"
23+
style="@style/Widget.AppCompat.Button.Borderless"/>
24+
25+
26+
<LinearLayout
27+
android:layout_width="match_parent"
28+
android:layout_height="wrap_content"
29+
android:id="@+id/content_layout"
30+
android:layout_centerInParent="true"
31+
>
32+
33+
<ProgressBar
1134
android:layout_width="wrap_content"
1235
android:layout_height="wrap_content"
13-
android:id="@+id/permission_request_button"
14-
android:text="@string/display_nearby_notification_summary"
36+
android:id="@+id/progressBar"
1537
android:layout_centerInParent="true"
16-
android:layout_marginLeft="8dp"
17-
android:layout_marginRight="8dp"
18-
android:layout_marginTop="8dp"
19-
android:minWidth="48dp"
20-
android:textColor="@android:color/white"
21-
android:singleLine="true"
22-
android:theme="?attr/mainScreenNearbyPermissionbutton"
23-
style="@style/Widget.AppCompat.Button.Borderless"/>
2438
/>
2539

26-
<RelativeLayout
40+
<ImageView
41+
android:id="@+id/nearby_icon"
42+
android:layout_width="40dp"
43+
android:layout_height="40dp"
44+
android:layout_marginLeft="16dp"
45+
android:layout_marginStart="16dp"
46+
android:scaleType="centerCrop"
47+
app:srcCompat="@drawable/ic_location_white_24dp"/>
48+
49+
50+
<LinearLayout
2751
android:layout_width="match_parent"
2852
android:layout_height="wrap_content"
29-
android:id="@+id/content_layout"
3053
android:layout_centerInParent="true"
54+
android:orientation="horizontal"
55+
android:layout_gravity="center_vertical"
56+
android:gravity="center_vertical"
57+
android:weightSum="4"
3158
>
3259

33-
<ProgressBar
34-
android:layout_width="wrap_content"
60+
<TextView
61+
android:id="@+id/nearby_title"
62+
android:layout_width="0dp"
3563
android:layout_height="wrap_content"
36-
android:id="@+id/progressBar"
64+
android:layout_weight="3"
3765
android:layout_centerInParent="true"
38-
/>
39-
40-
<ImageView
41-
android:id="@+id/nearby_icon"
42-
android:layout_width="40dp"
43-
android:layout_height="40dp"
4466
android:layout_marginLeft="16dp"
45-
android:layout_marginStart="16dp"
46-
android:scaleType="centerCrop"
47-
app:srcCompat="@drawable/ic_location_white_24dp"/>
67+
android:layout_marginRight="16dp"
68+
tools:text="test distance"
69+
android:textColor="@android:color/white"
70+
android:singleLine="true"
71+
>
72+
</TextView>
4873

49-
<LinearLayout
50-
android:layout_width="match_parent"
74+
<TextView
75+
android:id="@+id/nearby_distance"
76+
android:layout_width="0dp"
5177
android:layout_height="wrap_content"
52-
android:layout_centerInParent="true"
53-
android:orientation="horizontal"
54-
android:layout_toRightOf="@id/nearby_icon"
55-
android:weightSum="4"
78+
android:layout_weight="1"
79+
android:layout_marginLeft="16dp"
80+
android:layout_marginRight="16dp"
81+
android:minWidth="48dp"
82+
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
83+
tools:text="test distance"
84+
android:textColor="@android:color/white"
85+
android:singleLine="true"
5686
>
5787

58-
<TextView
59-
android:id="@+id/nearby_title"
60-
android:layout_width="0dp"
61-
android:layout_height="wrap_content"
62-
android:layout_weight="3"
63-
android:layout_toRightOf="@id/nearby_icon"
64-
android:layout_centerInParent="true"
65-
android:layout_marginLeft="16dp"
66-
android:layout_marginRight="16dp"
67-
tools:text="test distance"
68-
android:textColor="@android:color/white"
69-
android:singleLine="true"
70-
>
71-
</TextView>
72-
73-
<TextView
74-
android:id="@+id/nearby_distance"
75-
android:layout_width="0dp"
76-
android:layout_height="wrap_content"
77-
android:layout_weight="1"
78-
android:layout_alignParentEnd="true"
79-
android:layout_alignParentRight="true"
80-
android:layout_centerInParent="true"
81-
android:layout_marginLeft="16dp"
82-
android:layout_marginRight="16dp"
83-
android:minWidth="48dp"
84-
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
85-
tools:text="test distance"
86-
android:textColor="@android:color/white"
87-
android:singleLine="true"
88-
>
89-
90-
</TextView>
88+
</TextView>
9189

92-
</LinearLayout>
90+
</LinearLayout>
9391

94-
</RelativeLayout>
92+
</LinearLayout>
9593

9694
</RelativeLayout>

0 commit comments

Comments
 (0)