Fix dialogs

pull/253/head
Alex Baker 10 years ago
parent 52b4219419
commit 8e619bdd21

@ -294,15 +294,13 @@
<activity <activity
android:name="com.todoroo.astrid.core.DeleteFilterActivity" android:name="com.todoroo.astrid.core.DeleteFilterActivity"
android:theme="@style/Tasks.FullTransparent" /> android:theme="@style/Tasks.Dialog" />
<activity <activity
android:name="com.todoroo.astrid.tags.DeleteTagActivity" android:name="com.todoroo.astrid.tags.DeleteTagActivity"
android:theme="@style/Tasks.FullTransparent" /> android:theme="@style/Tasks.Dialog" />
<activity <activity
android:name="com.todoroo.astrid.tags.RenameTagActivity" android:name="com.todoroo.astrid.tags.RenameTagActivity"
android:theme="@style/Tasks.FullTransparent" /> android:theme="@style/Tasks.Dialog" />
<!-- alarms --> <!-- alarms -->
<receiver android:name="com.todoroo.astrid.alarms.AlarmTaskRepeatListener"> <receiver android:name="com.todoroo.astrid.alarms.AlarmTaskRepeatListener">
@ -347,7 +345,7 @@
<activity <activity
android:name=".activities.ClearGtaskDataActivity" android:name=".activities.ClearGtaskDataActivity"
android:theme="@style/ReminderDialog" /> android:theme="@style/Tasks.Dialog" />
<!-- repeats --> <!-- repeats -->
@ -394,23 +392,19 @@
<activity <activity
android:name=".activities.ClearAllDataActivity" android:name=".activities.ClearAllDataActivity"
android:theme="@style/ReminderDialog" /> android:theme="@style/Tasks.Dialog" />
<activity <activity
android:name=".activities.PurgeDeletedActivity" android:name=".activities.PurgeDeletedActivity"
android:theme="@style/ReminderDialog" /> android:theme="@style/Tasks.Dialog" />
<activity <activity
android:name=".activities.DeleteCompletedActivity" android:name=".activities.DeleteCompletedActivity"
android:theme="@style/ReminderDialog" /> android:theme="@style/Tasks.Dialog" />
<activity <activity
android:name=".activities.DeleteCompletedEventsActivity" android:name=".activities.DeleteCompletedEventsActivity"
android:theme="@style/ReminderDialog" /> android:theme="@style/Tasks.Dialog" />
<activity <activity
android:name=".activities.DeleteAllCalendarEventsActivity" android:name=".activities.DeleteAllCalendarEventsActivity"
android:theme="@style/ReminderDialog" /> android:theme="@style/Tasks.Dialog" />
<!-- backup --> <!-- backup -->

@ -126,14 +126,21 @@ public class DialogUtilities {
tryOnUiThread(activity, new Runnable() { tryOnUiThread(activity, new Runnable() {
@Override @Override
public void run() { public void run() {
new AlertDialog.Builder(activity) AlertDialog dialog = new AlertDialog.Builder(activity)
.setTitle(R.string.DLG_confirm_title) .setTitle(R.string.DLG_confirm_title)
.setMessage(text) .setMessage(text)
.setTitle(title) .setTitle(title)
.setIcon(icon) .setIcon(icon)
.setPositiveButton(okTitleId, okListener) .setPositiveButton(okTitleId, okListener)
.setNegativeButton(cancelTitleId, cancelListener) .setNegativeButton(cancelTitleId, cancelListener)
.show().setOwnerActivity(activity); .show();
dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
cancelListener.onClick(dialog, Dialog.BUTTON_NEGATIVE);
}
});
dialog.setOwnerActivity(activity);
} }
}); });
} }

@ -28,7 +28,6 @@ public class DeleteFilterActivity extends InjectingActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
setTheme(android.R.style.Theme_Dialog);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
final long id = getIntent().getLongExtra(CustomFilterExposer.TOKEN_FILTER_ID, -1); final long id = getIntent().getLongExtra(CustomFilterExposer.TOKEN_FILTER_ID, -1);

@ -143,17 +143,12 @@
<style name="ActionBarPopupThemeOverlay" parent="ThemeOverlay.AppCompat.Light" /> <style name="ActionBarPopupThemeOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="Tasks.Dialog" parent="@style/Theme.AppCompat.Light.Dialog"/>
<style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle"> <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
<item name="spinBars">false</item> <item name="spinBars">false</item>
</style> </style>
<style name="Tasks.FullTransparent" parent="@style/Theme.AppCompat">
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:backgroundDimEnabled">false</item>
<item name="android:windowIsFloating">true</item>
</style>
<!--================================================== General == --> <!--================================================== General == -->
<style name="TextAppearance" parent="android:TextAppearance"> <style name="TextAppearance" parent="android:TextAppearance">

Loading…
Cancel
Save