Skip to content

5191: Fix UI elements not conforming to dark mode #5193

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.

Sign up for GitHub

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

Merged
nicolas-raoul merged 10 commits into from
Apr 3, 2023
Merged

5191: Fix UI elements not conforming to dark mode #5193

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
268d63b
feedback dialog: fix black font in dark mode
RitikaPahwa4444 Mar 30, 2023
7c3d494
LocationPickerActivity: fix light map in dark mode
RitikaPahwa4444 Mar 30, 2023
8f8dcc0
Fix #5182 Switch From Mapbox to MapLibre (#5184)
kartikaykaushik14 Mar 31, 2023
0f1e526
fix issue #5015 - custom image selector not identifying photo locatio…
sivasubramaniamv Mar 31, 2023
065b79e
feedback dialog: fix black font in dark mode
RitikaPahwa4444 Mar 30, 2023
fbbd837
LocationPickerActivity: fix light map in dark mode
RitikaPahwa4444 Mar 30, 2023
2ffa8a1
LocationPicker: use predefined style based on device theme
RitikaPahwa4444 Mar 31, 2023
29c13fc
LocationPicker: use predefined style based on device theme
RitikaPahwa4444 Mar 31, 2023
3b1b0c8
LocationPickerActivityTest: add additional target exception in catch …
RitikaPahwa4444 Apr 1, 2023
3a2752f
LocationPickerConstants: remove extra newline introduced
RitikaPahwa4444 Apr 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
LocationPickerActivity: fix light map in dark mode
  • Loading branch information
@RitikaPahwa4444
RitikaPahwa4444 committed Mar 31, 2023
commit fbbd837e3789b28490e52c463a30c1fd7487ae0c
17 changes: 17 additions & 0 deletions app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
import fr.free.nrw.commons.Utils;
import fr.free.nrw.commons.kvstore.JsonKvStore;
import fr.free.nrw.commons.theme.BaseActivity;
import fr.free.nrw.commons.utils.SystemThemeUtils;
import javax.inject.Inject;
import javax.inject.Named;
import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -139,12 +140,24 @@ public class LocationPickerActivity extends BaseActivity implements OnMapReadyCa
@Named("default_preferences")
public
JsonKvStore applicationKvStore;
/**
* isDarkTheme: for keeping a track of the device theme and modifying the map theme accordingly
*/
@Inject
SystemThemeUtils systemThemeUtils;
private boolean isDarkTheme;

@Override
protected void onCreate(@Nullable final Bundle savedInstanceState) {
getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
super.onCreate(savedInstanceState);

<<<<<<< HEAD
=======
isDarkTheme = systemThemeUtils.isDeviceInNightMode();

getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
>>>>>>> LocationPickerActivity: fix light map in dark mode
final ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
actionBar.hide();
Expand Down Expand Up @@ -238,7 +251,11 @@ private void getToolbarUI() {
@Override
public void onMapReady(final MapboxMap mapboxMap) {
this.mapboxMap = mapboxMap;
<<<<<<< HEAD
mapboxMap.setStyle(Style.getPredefinedStyle("Streets"), this::onStyleLoaded);
=======
mapboxMap.setStyle(isDarkTheme ? Style.DARK : Style.MAPBOX_STREETS, this::onStyleLoaded);
>>>>>>> LocationPickerActivity: fix light map in dark mode
}

/**
Expand Down