Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Places (feature branch). #4182

Merged
merged 165 commits into from
Feb 5, 2024
Merged
Changes from 1 commit
Commits
Show all changes
165 commits
Select commit Hold shift + click to select a range
c1355c2
Quick stub of nearby.
dbrant Jan 13, 2023
48c3f07
Merge branch 'main' into nearby
dbrant Jan 31, 2023
926c60e
Get it!
dbrant Jan 31, 2023
7f99c74
Do it.
dbrant Feb 1, 2023
dc56c60
Wire in our own OkHttp client.
dbrant Feb 3, 2023
d40c688
Merge branch 'main' into nearby
dbrant Apr 5, 2023
12c9844
Fix.
dbrant Apr 5, 2023
fd5a76f
Merge branch 'main' into nearby
dbrant May 5, 2023
040e187
Create ViewModel for Nearby.
dbrant May 5, 2023
9cf9843
Disable logo and set attribution margins.
dbrant May 5, 2023
b3e2dc6
Basic markers.
dbrant May 5, 2023
adb2459
Set max zoom, for now.
dbrant May 5, 2023
75eeb91
Apply proper limits on API call.
dbrant May 5, 2023
a921d2b
Cache annotations, and make them clickable.
dbrant May 5, 2023
ae6d858
Slightly better marker.
dbrant May 5, 2023
aa30f80
Slightly better marker.
dbrant May 5, 2023
e130b2e
Merge branch 'nearby' of github.com:dbrant/apps-android-wikipedia int…
dbrant May 5, 2023
c0eedcb
Towards location tracking.
dbrant May 5, 2023
959433b
Real-time user location.
dbrant May 5, 2023
8bc919d
Introduce slop factor for fetching updated articles.
dbrant May 5, 2023
3c6b9b1
With thumbnails.
dbrant May 5, 2023
cdc70f4
Yes.
dbrant May 7, 2023
2348a2d
Don't fetch updates if zoomed out too far.
dbrant May 7, 2023
cccf365
Realign markers a bit.
dbrant May 7, 2023
f2acfdb
Merge branch 'main' into nearby
dbrant May 8, 2023
85ee8d7
Recycle remaining bitmaps on destroy.
dbrant May 9, 2023
b6cd553
Simplify initialization.
dbrant May 9, 2023
5575938
Correctly pass search radius.
dbrant May 9, 2023
84de30d
Wire up link preview dialog.
dbrant May 9, 2023
3907d8a
Precalculate Paint and Rect objects.
dbrant May 9, 2023
c8be287
Accept approximate location.
dbrant May 9, 2023
38cf528
Merge branch 'main' into nearby
dbrant May 16, 2023
d10fb1b
Adapt.
dbrant May 16, 2023
e020488
Merge branch 'main' into nearby
dbrant Jun 27, 2023
aaadeef
Explicitly specify referrer when fetching map tiles.
dbrant Jun 27, 2023
7b07857
Merge branch 'main' into nearby
dbrant Jul 18, 2023
6b381b5
Merge branch 'main' into nearby
dbrant Jul 26, 2023
a5d2a31
Use Open Sans font, and update endpoints to Labs.
dbrant Jul 27, 2023
68692e9
Merge branch 'main' into nearby
dbrant Aug 1, 2023
c535dbc
Use production maps.
dbrant Aug 1, 2023
6e04168
Update suggested style json.
dbrant Aug 1, 2023
98161e6
Use correct font stack for markers.
dbrant Aug 1, 2023
f269e8a
Merge branch 'main' into nearby
dbrant Sep 12, 2023
e0fae91
qq strings.
dbrant Sep 12, 2023
227c9cd
Merge branch 'main' into nearby_design
dbrant Sep 12, 2023
f2f092c
Duplicate string.
dbrant Sep 12, 2023
8d35908
Merge branch 'main' into nearby_design
dbrant Sep 20, 2023
bc9de77
Merge branch 'main' into nearby_design
sharvaniharan Oct 19, 2023
13ae3e7
Merge branch 'main' into nearby_design
sharvaniharan Oct 24, 2023
b285d6c
Merge branch 'main' into nearby_design
cooltey Nov 22, 2023
c09d279
Merge branch 'main' into nearby_design
cooltey Nov 27, 2023
fac7a9c
Nearby: Move nearby to main nav more menu (#4298)
sharvaniharan Nov 28, 2023
2c6ec6b
Update maplibre versions (#4306)
cooltey Nov 29, 2023
89765ff
Merge branch 'main' into nearby_design
cooltey Dec 6, 2023
96693eb
Change label to `Places` (#4323)
sharvaniharan Dec 7, 2023
842a67a
Merge branch 'main' into nearby_design
cooltey Dec 7, 2023
d73fc50
Merge branch 'main' into nearby_design
cooltey Dec 11, 2023
fa1212a
Places: adding dark theme JSON for the map (#4307)
cooltey Dec 12, 2023
a540e20
Merge branch 'nearby_design' of github.com:wikimedia/apps-android-wik…
dbrant Dec 12, 2023
89e1674
Update history entry constant.
dbrant Dec 12, 2023
adea940
Set HistoryEntry constant to what it used to be.
dbrant Dec 12, 2023
6763906
Merge branch 'main' into nearby_design
cooltey Dec 12, 2023
1142997
Places: Clustering (#4309)
sharvaniharan Dec 13, 2023
9166cf1
Places: Add View on map option to customize toolbar (#4308)
cooltey Dec 14, 2023
8c632b3
Merge branch 'main' into nearby_design
sharvaniharan Dec 14, 2023
e754de2
Merge branch 'main' into nearby_design
cooltey Dec 14, 2023
c700c63
Merge branch 'main' into nearby_design
cooltey Dec 18, 2023
fd217ab
Merge branch 'main' into nearby_design
cooltey Dec 19, 2023
76483b9
A few preliminary bits.
dbrant Dec 20, 2023
8205ce5
A few more preliminaries.
dbrant Dec 20, 2023
98dfe8e
Merge branch 'main' into nearby_design
cooltey Dec 20, 2023
28d4126
Introduce Search bar at the top.
dbrant Dec 20, 2023
49384db
Merge branch 'nearby_design' of github.com:wikimedia/apps-android-wik…
dbrant Dec 20, 2023
4b1880e
Merge branch 'main' into nearby_design
dbrant Dec 21, 2023
e32fd96
Use correct gravity and margins for compass and attribution.
dbrant Dec 21, 2023
3b727eb
Update style of FAB.
dbrant Dec 21, 2023
9327ced
Merge branch 'main' into nearby_design
cooltey Dec 21, 2023
cd11c21
Merge branch 'main' into nearby_design
cooltey Dec 21, 2023
7578584
Fix error
cooltey Dec 21, 2023
f1ec94c
Merge branch 'main' into nearby_design
cooltey Jan 2, 2024
712a110
Merge branch 'main' into nearby_design
sharvaniharan Jan 2, 2024
f7a0dcc
Merge branch 'main' into nearby_design
cooltey Jan 2, 2024
2d03ecf
Merge branch 'nearby_design' of github.com:wikimedia/apps-android-wik…
cooltey Jan 2, 2024
70f447d
Merge branch 'main' into nearby_design
cooltey Jan 4, 2024
3254623
Merge branch 'main' into nearby_design
cooltey Jan 5, 2024
28e57c3
Merge branch 'main' into nearby_design
cooltey Jan 8, 2024
bbaa5a9
Merge branch 'main' into nearby_design
cooltey Jan 9, 2024
d1229b3
Merge branch 'main' into nearby_design
cooltey Jan 10, 2024
6ef5497
Merge branch 'main' into nearby_design
cooltey Jan 10, 2024
9ea0032
Merge branch 'main' into nearby_design
cooltey Jan 11, 2024
a02df2b
Merge branch 'main' into nearby_design
cooltey Jan 11, 2024
1445c07
Places: update UI elements on map (#4343)
cooltey Jan 12, 2024
de9ea58
Places: Search (#4319)
sharvaniharan Jan 12, 2024
e68b0d7
A touch of cleanup.
dbrant Jan 12, 2024
a66c651
Merge branch 'main' into nearby_design
dbrant Jan 12, 2024
150f4a4
Stray bits.
dbrant Jan 12, 2024
3e4be22
Places condition change - Minor fix
Jan 12, 2024
c60997e
Merge branch 'main' into nearby_design
cooltey Jan 16, 2024
e8502ca
change icons position and added a todo comment for optimization
cooltey Jan 17, 2024
b55b822
Places: Update ‘article preview’ bottom sheet for places (#4334)
cooltey Jan 17, 2024
be2311c
Merge branch 'main' into nearby_design
dbrant Jan 17, 2024
9f71183
Follow-up: run animation when opening in new tab. (#4389)
dbrant Jan 17, 2024
6b0a379
Change 8dp to 12dp for compass margin
cooltey Jan 17, 2024
3318abc
Merge branch 'main' into nearby_design
sharvaniharan Jan 17, 2024
1f62176
Revert "Merge branch 'main' into nearby_design"
dbrant Jan 17, 2024
1674588
Merge branch 'main' into nearby_design
dbrant Jan 17, 2024
06de438
Untangle from earlier merge.
dbrant Jan 17, 2024
03ac77a
Further untangle.
dbrant Jan 17, 2024
51a8ab3
Merge branch 'main' into nearby_design
dbrant Jan 17, 2024
6f40831
Minor: Add places condition to prefix search results too
Jan 17, 2024
ef9691d
Design tweak: Places search (#4392)
sharvaniharan Jan 18, 2024
10fe3a9
Places Filter screen: Design tweaks (#4383)
sharvaniharan Jan 18, 2024
fce50b0
Set title in xml.
dbrant Jan 18, 2024
5f807eb
Make search field single-line.
dbrant Jan 18, 2024
9fde6c9
Factor out showing of link preview.
dbrant Jan 18, 2024
a361ac0
Use parcelable extension.
dbrant Jan 18, 2024
8b4d0c1
Bump z-order of selected marker, and clarify naming.
dbrant Jan 18, 2024
2be9b8e
Factor out setting of magnified symbol.
dbrant Jan 18, 2024
2ed78ee
Use highlightedPageTitle as it was intended.
dbrant Jan 18, 2024
382609e
Title could contain html.
dbrant Jan 18, 2024
310e0f7
Minor: Filter design update
Jan 18, 2024
36246ef
Merge branch 'main' into nearby_design
cooltey Jan 18, 2024
1017183
Open up maximum zoom level in the map. (#4395)
dbrant Jan 18, 2024
4df958f
Re-introduce minimum movement offset for querying map updates. (#4396)
dbrant Jan 18, 2024
64dde04
(Places) Correctly handle insets. (#4397)
dbrant Jan 18, 2024
bc0f12c
Places: reset the search bar text and icon after dismissing the link …
cooltey Jan 19, 2024
e6441da
Show link preview dialog if access from an article (#4401)
cooltey Jan 19, 2024
48523c6
(Places) remove postDelayed calls. (#4402)
dbrant Jan 19, 2024
2be8b94
Merge branch 'main' into nearby_design
cooltey Jan 19, 2024
9043590
Save last location information to the preference (#4400)
cooltey Jan 20, 2024
ffff102
(Places) Clean up searching, and correctly remember last search term.…
dbrant Jan 20, 2024
a12eff8
Merge branch 'main' into nearby_design
cooltey Jan 22, 2024
cd40154
Remove unused method
cooltey Jan 23, 2024
69964fb
Make sure the tab icon is visible when tab count > 0
cooltey Jan 24, 2024
3f0315c
Merge branch 'main' into nearby_design
cooltey Jan 25, 2024
3cc8407
Merge branch 'main' into nearby_design
cooltey Jan 25, 2024
619932a
Merge branch 'main' into nearby_design
cooltey Jan 25, 2024
d6fa0b6
Places: Build a "list" view of places, alongside the "map" view (#4357)
cooltey Jan 26, 2024
bd1cbfa
Remove extracts usage and update list view design
cooltey Jan 26, 2024
4b61f21
Merge branch 'main' into nearby_design
cooltey Jan 29, 2024
f641efe
Merge branch 'main' into nearby_design
cooltey Jan 29, 2024
c886e04
Apply description once
cooltey Jan 29, 2024
565d1fe
Align to the middle of vertical correctly
cooltey Jan 29, 2024
d976988
Merge branch 'main' into nearby_design
sharvaniharan Jan 30, 2024
593222f
Merge branch 'main' into nearby_design
cooltey Jan 30, 2024
dfd1a75
Places: apply new language and tab counts view to Places (#4425)
cooltey Jan 30, 2024
dda1d68
Use linearLayout instead
cooltey Jan 30, 2024
8259f2d
Move transition parameter to the searchText and update contentDescripton
cooltey Jan 30, 2024
9588356
Places: Bring back bottomsheet dim (#4426)
sharvaniharan Jan 31, 2024
cd004e8
Places: Discovery with tooltips (#4407)
sharvaniharan Jan 31, 2024
19bab68
Merge branch 'main' into nearby_design
sharvaniharan Jan 31, 2024
c6ab789
Places: Survey (#4412)
sharvaniharan Feb 1, 2024
25d23ea
Simplify and optimize code in PlacesFilterActivity (#4430)
cooltey Feb 1, 2024
cdb2cc4
Respect isImageDownloadedEnabled setting in Places (#4436)
cooltey Feb 2, 2024
90c8622
Fix: use null-safe for LinkPreviewDialog action button (#4433)
cooltey Feb 2, 2024
ba036e2
Fix: use lastKnownLocation instead of the last map location for dista…
cooltey Feb 2, 2024
756463f
Merge branch 'main' into nearby_design
dbrant Feb 2, 2024
bf2448c
Set distance location at binding time.
dbrant Feb 2, 2024
4ead5c8
Merge branch 'main' into nearby_design
dbrant Feb 2, 2024
42cbdc9
Merge branch 'main' into nearby_design
dbrant Feb 2, 2024
5dc01ee
Merge branch 'main' into nearby_design
cooltey Feb 5, 2024
1b8837a
Fix: dismiss the LinkPreviewDialog when changing device's orientation…
cooltey Feb 5, 2024
db4340a
Minor code update for Places (#4441)
cooltey Feb 5, 2024
8fed14b
Places: Data wiring (#4384)
sharvaniharan Feb 5, 2024
1f169a3
Merge branch 'main' into nearby_design
dbrant Feb 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
73 changes: 36 additions & 37 deletions app/src/main/res/layout/item_places_list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,50 +9,49 @@
android:paddingVertical="12dp"
android:paddingHorizontal="@dimen/list_item_horizontal_padding">

<TextView
android:id="@+id/listItemTitle"
style="@style/H3.Article"
<LinearLayout
sharvaniharan marked this conversation as resolved.
Show resolved Hide resolved
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginEnd="12dp"
android:paddingBottom="2dp"
android:textColor="?attr/primary_color"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@id/listItemDescription"
app:layout_constraintEnd_toStartOf="@id/listItemThumbnail"
tools:text="Lorem ipsum" />
app:layout_constraintBottom_toBottomOf="parent">

<org.wikipedia.views.GoneIfEmptyTextView
android:id="@+id/listItemDescription"
style="@style/List.MaterialListDescription"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:paddingTop="2dp"
android:paddingBottom="3dp"
android:ellipsize="end"
app:layout_constraintTop_toTopOf="@id/listItemThumbnail"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="@id/listItemThumbnail"
app:layout_constraintEnd_toStartOf="@id/listItemThumbnail"
tools:text="Lorem ipsum" />
<TextView
android:id="@+id/listItemTitle"
style="@style/H3.Article"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="2dp"
android:textColor="?attr/primary_color"
tools:text="Lorem ipsum Lorem ipsum Lorem ipsum Lorem ipsum" />

<TextView
style="@style/H4"
android:id="@+id/listItemDistance"
android:layout_width="0dp"
android:layout_height="match_parent"
android:textColor="?attr/success_color"
android:paddingTop="3dp"
android:layout_marginStart="-4dp"
android:layout_marginEnd="12dp"
android:gravity="center_vertical"
android:drawablePadding="4dp"
app:drawableStartCompat="@drawable/location_gradient"
app:layout_constraintTop_toBottomOf="@id/listItemDescription"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/listItemThumbnail"
tools:text="Lorem ipsum" />
<org.wikipedia.views.GoneIfEmptyTextView
android:id="@+id/listItemDescription"
style="@style/List.MaterialListDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="2dp"
android:paddingBottom="3dp"
android:ellipsize="end"
tools:text="Lorem ipsum" />

<TextView
style="@style/H4"
android:id="@+id/listItemDistance"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textColor="?attr/success_color"
android:paddingTop="3dp"
android:layout_marginStart="-4dp"
android:gravity="center_vertical"
android:drawablePadding="4dp"
app:drawableStartCompat="@drawable/location_gradient"
tools:text="Lorem ipsum" />

</LinearLayout>

<ImageView
android:id="@+id/listItemThumbnail"
Expand Down