Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add profile dialog to settings

Browse source
This commit is contained in:
Victor Shcherb 2013-07-16 01:52:49 +02:00
parent a253d95dd5
commit 216b92efc4
3 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/layout/mode_toggles.xml
View file

@ -2,7 +2,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal" android:layout_gravity="center_horizontal" android:gravity="center_horizontal"> android:orientation="horizontal" android:layout_gravity="center_horizontal" android:gravity="center_horizontal"
android:layout_marginTop="7dp"
android:layout_marginBottom="7dp">
<ToggleButton <ToggleButton
android:id="@+id/DefaultButton" android:id="@+id/DefaultButton"

6
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -465,7 +465,8 @@ public class MapActivityActions implements DialogProvider {
} }
public static View showActivityActionsDialog(Activity a, final Set<ApplicationMode> selected, boolean showDefault) { public static View showActivityActionsDialog(Activity a, final Set<ApplicationMode> selected, boolean showDefault,
final View.OnClickListener onClickListener) {
View view = a.getLayoutInflater().inflate(R.layout.mode_toggles, null); View view = a.getLayoutInflater().inflate(R.layout.mode_toggles, null);
OsmandSettings settings = ((OsmandApplication) a.getApplication()).getSettings(); OsmandSettings settings = ((OsmandApplication) a.getApplication()).getSettings();
boolean lc = settings.isLightContentMenu(); boolean lc = settings.isLightContentMenu();
@ -523,6 +524,9 @@ public class MapActivityActions implements DialogProvider {
buttons[ind].setChecked(true); buttons[ind].setChecked(true);
} }
} }
if(onClickListener != null) {
onClickListener.onClick(null);
}
} }
}); });
} }

20
OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
View file

@ -21,7 +21,6 @@ import android.app.AlertDialog;
import android.app.AlertDialog.Builder; import android.app.AlertDialog.Builder;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.content.DialogInterface.OnMultiChoiceClickListener; import android.content.DialogInterface.OnMultiChoiceClickListener;
import android.os.Bundle; import android.os.Bundle;
import android.preference.CheckBoxPreference; import android.preference.CheckBoxPreference;
@ -305,18 +304,17 @@ public abstract class SettingsBaseActivity extends SherlockPreferenceActivity im
protected void profileDialog() { protected void profileDialog() {
Builder b = new AlertDialog.Builder(this); Builder b = new AlertDialog.Builder(this);
final Set<ApplicationMode> selected = new LinkedHashSet<ApplicationMode>(); final Set<ApplicationMode> selected = new LinkedHashSet<ApplicationMode>();
View v = MapActivityActions.showActivityActionsDialog(this, selected, false); View v = MapActivityActions.showActivityActionsDialog(this, selected, false,
new View.OnClickListener() {
@Override
public void onClick(View v) {
if(selected.size() > 0) {
setSelectedAppMode(selected.iterator().next());
}
}
});
b.setTitle(R.string.profile_settings); b.setTitle(R.string.profile_settings);
b.setView(v); b.setView(v);
b.setPositiveButton(R.string.default_buttons_ok, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if(selected.size() > 0) {
setSelectedAppMode(selected.iterator().next());
}
}
});
b.show(); b.show();
} }