diff --git a/app/src/main/java/com/android/colorpicker/ColorPickerDialog.java b/app/src/main/java/com/android/colorpicker/ColorPickerDialog.java index 4bbbab6aa..114c5fed5 100644 --- a/app/src/main/java/com/android/colorpicker/ColorPickerDialog.java +++ b/app/src/main/java/com/android/colorpicker/ColorPickerDialog.java @@ -18,9 +18,9 @@ package com.android.colorpicker; import android.app.Activity; import android.app.Dialog; -import android.app.DialogFragment; import android.os.Bundle; import android.support.v7.app.AlertDialog; +import android.support.v7.app.AppCompatDialogFragment; import android.view.LayoutInflater; import android.view.View; import android.widget.ProgressBar; @@ -33,7 +33,7 @@ import org.isoron.uhabits.R; * A dialog which takes in as input an array of palette and creates a palette allowing the user to * select a specific color swatch, which invokes a listener. */ -public class ColorPickerDialog extends DialogFragment implements OnColorSelectedListener { +public class ColorPickerDialog extends AppCompatDialogFragment implements OnColorSelectedListener { public static final int SIZE_LARGE = 1; public static final int SIZE_SMALL = 2; diff --git a/app/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java b/app/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java index e365005f4..f36ad2780 100644 --- a/app/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java +++ b/app/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java @@ -30,6 +30,7 @@ import android.content.Context; import android.content.res.ColorStateList; import android.content.res.Resources; import android.os.Bundle; +import android.support.v7.app.AppCompatDialogFragment; import android.util.Log; import android.view.KeyCharacterMap; import android.view.KeyEvent; @@ -49,7 +50,7 @@ import com.android.datetimepicker.time.RadialPickerLayout.OnValueSelectedListene /** * Dialog to set a time. */ -public class TimePickerDialog extends DialogFragment implements OnValueSelectedListener{ +public class TimePickerDialog extends AppCompatDialogFragment implements OnValueSelectedListener{ private static final String TAG = "TimePickerDialog"; private static final String KEY_HOUR_OF_DAY = "hour_of_day"; diff --git a/app/src/main/java/org/isoron/uhabits/MainActivity.java b/app/src/main/java/org/isoron/uhabits/MainActivity.java index 8a927e712..0499ef002 100644 --- a/app/src/main/java/org/isoron/uhabits/MainActivity.java +++ b/app/src/main/java/org/isoron/uhabits/MainActivity.java @@ -81,7 +81,7 @@ public class MainActivity extends BaseActivity prefs = PreferenceManager.getDefaultSharedPreferences(this); listHabitsFragment = - (ListHabitsFragment) getFragmentManager().findFragmentById(R.id.fragment1); + (ListHabitsFragment) getSupportFragmentManager().findFragmentById(R.id.fragment1); receiver = new Receiver(); localBroadcastManager = LocalBroadcastManager.getInstance(this); diff --git a/app/src/main/java/org/isoron/uhabits/dialogs/EditHabitDialogFragment.java b/app/src/main/java/org/isoron/uhabits/dialogs/EditHabitDialogFragment.java index ff1c4a946..1baa97cbe 100644 --- a/app/src/main/java/org/isoron/uhabits/dialogs/EditHabitDialogFragment.java +++ b/app/src/main/java/org/isoron/uhabits/dialogs/EditHabitDialogFragment.java @@ -20,10 +20,10 @@ package org.isoron.uhabits.dialogs; import android.annotation.SuppressLint; -import android.app.DialogFragment; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; +import android.support.v7.app.AppCompatDialogFragment; import android.text.format.DateFormat; import android.view.LayoutInflater; import android.view.View; @@ -51,7 +51,7 @@ import org.isoron.uhabits.models.Habit; import java.util.Arrays; -public class EditHabitDialogFragment extends DialogFragment +public class EditHabitDialogFragment extends AppCompatDialogFragment implements OnClickListener, WeekdayPickerDialog.OnWeekdaysPickedListener, TimePickerDialog.OnTimeSetListener, Spinner.OnItemSelectedListener { diff --git a/app/src/main/java/org/isoron/uhabits/dialogs/HistoryEditorDialog.java b/app/src/main/java/org/isoron/uhabits/dialogs/HistoryEditorDialog.java index c8a923d99..cd95e9212 100644 --- a/app/src/main/java/org/isoron/uhabits/dialogs/HistoryEditorDialog.java +++ b/app/src/main/java/org/isoron/uhabits/dialogs/HistoryEditorDialog.java @@ -20,11 +20,11 @@ package org.isoron.uhabits.dialogs; import android.app.Dialog; -import android.app.DialogFragment; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; import android.support.v7.app.AlertDialog; +import android.support.v7.app.AppCompatDialogFragment; import android.util.DisplayMetrics; import org.isoron.uhabits.R; @@ -32,7 +32,7 @@ import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.tasks.BaseTask; import org.isoron.uhabits.views.HabitHistoryView; -public class HistoryEditorDialog extends DialogFragment +public class HistoryEditorDialog extends AppCompatDialogFragment implements DialogInterface.OnClickListener { private Habit habit; diff --git a/app/src/main/java/org/isoron/uhabits/dialogs/WeekdayPickerDialog.java b/app/src/main/java/org/isoron/uhabits/dialogs/WeekdayPickerDialog.java index 55b72a091..5297b80eb 100644 --- a/app/src/main/java/org/isoron/uhabits/dialogs/WeekdayPickerDialog.java +++ b/app/src/main/java/org/isoron/uhabits/dialogs/WeekdayPickerDialog.java @@ -20,15 +20,15 @@ package org.isoron.uhabits.dialogs; import android.app.Dialog; -import android.app.DialogFragment; import android.content.DialogInterface; import android.os.Bundle; import android.support.v7.app.AlertDialog; +import android.support.v7.app.AppCompatDialogFragment; import org.isoron.uhabits.R; import org.isoron.uhabits.helpers.DateHelper; -public class WeekdayPickerDialog extends DialogFragment +public class WeekdayPickerDialog extends AppCompatDialogFragment implements DialogInterface.OnMultiChoiceClickListener, DialogInterface.OnClickListener { diff --git a/app/src/main/java/org/isoron/uhabits/fragments/HabitSelectionCallback.java b/app/src/main/java/org/isoron/uhabits/fragments/HabitSelectionCallback.java index 0abed8c55..5ead5c113 100644 --- a/app/src/main/java/org/isoron/uhabits/fragments/HabitSelectionCallback.java +++ b/app/src/main/java/org/isoron/uhabits/fragments/HabitSelectionCallback.java @@ -159,7 +159,7 @@ public class HabitSelectionCallback implements ActionMode.Callback EditHabitDialogFragment frag = EditHabitDialogFragment.editSingleHabitFragment(firstHabit.getId()); frag.setOnSavedListener(onSavedListener); - frag.show(activity.getFragmentManager(), "editHabit"); + frag.show(activity.getSupportFragmentManager(), "editHabit"); return true; } @@ -182,7 +182,7 @@ public class HabitSelectionCallback implements ActionMode.Callback mode.finish(); } }); - picker.show(activity.getFragmentManager(), "picker"); + picker.show(activity.getSupportFragmentManager(), "picker"); return true; } diff --git a/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java b/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java index 6b112cf5b..5fc8647b2 100644 --- a/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java +++ b/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java @@ -20,13 +20,13 @@ package org.isoron.uhabits.fragments; import android.app.Activity; -import android.app.Fragment; import android.content.Intent; import android.content.SharedPreferences; import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; import android.view.ActionMode; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; @@ -50,18 +50,18 @@ import com.mobeta.android.dslv.DragSortController; import com.mobeta.android.dslv.DragSortListView; import com.mobeta.android.dslv.DragSortListView.DropListener; -import org.isoron.uhabits.R; import org.isoron.uhabits.BaseActivity; +import org.isoron.uhabits.R; import org.isoron.uhabits.commands.Command; import org.isoron.uhabits.commands.ToggleRepetitionCommand; import org.isoron.uhabits.dialogs.EditHabitDialogFragment; import org.isoron.uhabits.dialogs.FilePickerDialog; import org.isoron.uhabits.helpers.DatabaseHelper; import org.isoron.uhabits.helpers.DateHelper; -import org.isoron.uhabits.helpers.UIHelper.OnSavedListener; import org.isoron.uhabits.helpers.HintManager; import org.isoron.uhabits.helpers.ListHabitsHelper; import org.isoron.uhabits.helpers.ReminderHelper; +import org.isoron.uhabits.helpers.UIHelper.OnSavedListener; import org.isoron.uhabits.loaders.HabitListLoader; import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.tasks.ExportCSVTask; diff --git a/app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java b/app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java index f1684ce8e..a89d23e29 100644 --- a/app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java +++ b/app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java @@ -19,11 +19,11 @@ package org.isoron.uhabits.fragments; -import android.app.Fragment; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater;