narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Use correct theme in mapping activity

Browse source
This commit is contained in:
Sam Whited 2018-04-18 10:58:34 -05:00
parent a7b6d1f1d8
commit 60f2ce3a74
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/ui/LocationActivity.java
View file

@ -36,6 +36,7 @@ import eu.siacs.conversations.R;
import eu.siacs.conversations.ui.util.LocationHelper; import eu.siacs.conversations.ui.util.LocationHelper;
import eu.siacs.conversations.ui.widget.Marker; import eu.siacs.conversations.ui.widget.Marker;
import eu.siacs.conversations.ui.widget.MyLocation; import eu.siacs.conversations.ui.widget.MyLocation;
import eu.siacs.conversations.utils.ThemeHelper;
public abstract class LocationActivity extends ActionBarActivity implements LocationListener { public abstract class LocationActivity extends ActionBarActivity implements LocationListener {
protected LocationManager locationManager; protected LocationManager locationManager;
@ -80,6 +81,7 @@ public abstract class LocationActivity extends ActionBarActivity implements Loca
protected void onCreate(final Bundle savedInstanceState) { protected void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
final Context ctx = getApplicationContext(); final Context ctx = getApplicationContext();
setTheme(ThemeHelper.find(this));
final PackageManager packageManager = ctx.getPackageManager(); final PackageManager packageManager = ctx.getPackageManager();
hasLocationFeature = packageManager.hasSystemFeature(PackageManager.FEATURE_LOCATION) || hasLocationFeature = packageManager.hasSystemFeature(PackageManager.FEATURE_LOCATION) ||
@ -87,10 +89,6 @@ public abstract class LocationActivity extends ActionBarActivity implements Loca
packageManager.hasSystemFeature(PackageManager.FEATURE_LOCATION_NETWORK); packageManager.hasSystemFeature(PackageManager.FEATURE_LOCATION_NETWORK);
this.locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE); this.locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
this.marker_icon = BitmapFactory.decodeResource(ctx.getResources(), R.drawable.marker); this.marker_icon = BitmapFactory.decodeResource(ctx.getResources(), R.drawable.marker);
final Boolean dark = PreferenceManager.getDefaultSharedPreferences(ctx)
.getString("theme", "light").equals("dark");
final int mTheme = dark ? R.style.ConversationsTheme_Dark : R.style.ConversationsTheme;
setTheme(mTheme);
// Ask for location permissions if location services are enabled and we're // Ask for location permissions if location services are enabled and we're
// just starting the activity (we don't want to keep pestering them on every // just starting the activity (we don't want to keep pestering them on every