isoron
/
loop
mirror of https://github.com/iSoron/uhabits.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename DialogHelper to UIHelper

Browse Source
pull/77/merge
Alinson S. Xavier 10 years ago
parent bf6562f854
commit 02e45dbe27
12 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File

4
app/src/androidTest/java/org/isoron/uhabits/unit/views/ViewTest.java
Unescape View File

@ -27,7 +27,7 @@ import android.view.MotionEvent;
import android.view.View;
import org.isoron.uhabits.BaseTest;
import org.isoron.uhabits.helpers.DialogHelper;
import org.isoron.uhabits.helpers.UIHelper;
import java.io.File;
import java.io.FileOutputStream;
@ -179,7 +179,7 @@ public class ViewTest extends BaseTest
protected int dpToPixels(int dp)
{
return (int) DialogHelper.dpToPixels(targetContext, dp);
return (int) UIHelper.dpToPixels(targetContext, dp);
}
protected void tap(GestureDetector.OnGestureListener view, int x, int y) throws InterruptedException

6
app/src/main/java/org/isoron/uhabits/MainActivity.java
Unescape View File

@ -37,7 +37,7 @@ import android.view.Menu;
import android.view.MenuItem;
import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.helpers.DialogHelper;
import org.isoron.uhabits.helpers.UIHelper;
import org.isoron.uhabits.fragments.ListHabitsFragment;
import org.isoron.uhabits.helpers.ReminderHelper;
import org.isoron.uhabits.models.Habit;
@ -85,8 +85,8 @@ public class MainActivity extends BaseActivity
private void onStartup()
{
PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
DialogHelper.incrementLaunchCount(this);
DialogHelper.updateLastAppVersion(this);
UIHelper.incrementLaunchCount(this);
UIHelper.updateLastAppVersion(this);
showTutorial();
new AsyncTask<Void, Void, Void>() {

2
app/src/main/java/org/isoron/uhabits/fragments/EditHabitFragment.java
Unescape View File

@ -42,7 +42,7 @@ import com.android.datetimepicker.time.TimePickerDialog;
import org.isoron.uhabits.helpers.ColorHelper;
import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.helpers.DialogHelper.OnSavedListener;
import org.isoron.uhabits.helpers.UIHelper.OnSavedListener;
import org.isoron.uhabits.R;
import org.isoron.uhabits.commands.Command;
import org.isoron.uhabits.commands.CreateHabitCommand;

6
app/src/main/java/org/isoron/uhabits/fragments/HabitSelectionCallback.java
Unescape View File

@ -36,7 +36,7 @@ import org.isoron.uhabits.commands.ChangeHabitColorCommand;
import org.isoron.uhabits.commands.DeleteHabitsCommand;
import org.isoron.uhabits.commands.UnarchiveHabitsCommand;
import org.isoron.uhabits.helpers.ColorHelper;
import org.isoron.uhabits.helpers.DialogHelper;
import org.isoron.uhabits.helpers.UIHelper;
import org.isoron.uhabits.loaders.HabitListLoader;
import org.isoron.uhabits.models.Habit;
@ -49,7 +49,7 @@ public class HabitSelectionCallback implements ActionMode.Callback
private List<Integer> selectedPositions;
private BaseActivity activity;
private Listener listener;
private DialogHelper.OnSavedListener onSavedListener;
private UIHelper.OnSavedListener onSavedListener;
private ProgressBar progressBar;
public interface Listener
@ -74,7 +74,7 @@ public class HabitSelectionCallback implements ActionMode.Callback
this.progressBar = progressBar;
}
public void setOnSavedListener(DialogHelper.OnSavedListener onSavedListener)
public void setOnSavedListener(UIHelper.OnSavedListener onSavedListener)
{
this.onSavedListener = onSavedListener;
}

3
app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java
Unescape View File

@ -56,8 +56,7 @@ import org.isoron.uhabits.commands.Command;
import org.isoron.uhabits.commands.ToggleRepetitionCommand;
import org.isoron.uhabits.dialogs.FilePickerDialog;
import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.helpers.DialogHelper;
import org.isoron.uhabits.helpers.DialogHelper.OnSavedListener;
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;

4
app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java
Unescape View File

@ -38,7 +38,7 @@ import android.widget.Spinner;
import android.widget.TextView;
import org.isoron.uhabits.helpers.ColorHelper;
import org.isoron.uhabits.helpers.DialogHelper;
import org.isoron.uhabits.helpers.UIHelper;
import org.isoron.uhabits.HabitBroadcastReceiver;
import org.isoron.uhabits.R;
import org.isoron.uhabits.ShowHabitActivity;
@ -60,7 +60,7 @@ import java.util.LinkedList;
import java.util.List;
public class ShowHabitFragment extends Fragment
implements DialogHelper.OnSavedListener, HistoryEditorDialog.Listener,
implements UIHelper.OnSavedListener, HistoryEditorDialog.Listener,
Spinner.OnItemSelectedListener
{
@Nullable

2
app/src/main/java/org/isoron/uhabits/helpers/DialogHelper.java → app/src/main/java/org/isoron/uhabits/helpers/UIHelper.java
Unescape View File

@ -33,7 +33,7 @@ import android.view.inputmethod.InputMethodManager;
import org.isoron.uhabits.BuildConfig;
import org.isoron.uhabits.commands.Command;
public abstract class DialogHelper
public abstract class UIHelper
{
public static final String ISORON_NAMESPACE = "http://isoron.org/android";

4
app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
Unescape View File

@ -32,7 +32,7 @@ import android.view.MotionEvent;
import org.isoron.uhabits.R;
import org.isoron.uhabits.helpers.ColorHelper;
import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.helpers.DialogHelper;
import org.isoron.uhabits.helpers.UIHelper;
import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.tasks.ToggleRepetitionTask;
@ -135,7 +135,7 @@ public class HabitHistoryView extends ScrollableDataView implements HabitDataVie
float baseSize = height / 8.0f;
setScrollerBucketSize((int) baseSize);
squareSpacing = DialogHelper.dpToPixels(getContext(), 1.0f);
squareSpacing = UIHelper.dpToPixels(getContext(), 1.0f);
float maxTextSize = getResources().getDimensionPixelSize(R.dimen.regularTextSize);
float textSize = Math.min(baseSize * 0.5f, maxTextSize);

8
app/src/main/java/org/isoron/uhabits/views/NumberView.java
Unescape View File

@ -33,7 +33,7 @@ import android.view.View;
import org.isoron.uhabits.R;
import org.isoron.uhabits.helpers.ColorHelper;
import org.isoron.uhabits.helpers.DialogHelper;
import org.isoron.uhabits.helpers.UIHelper;
public class NumberView extends View
{
@ -66,9 +66,9 @@ public class NumberView extends View
this.textSize = getResources().getDimension(R.dimen.regularTextSize);
this.label = DialogHelper.getAttribute(context, attrs, "label", "Number");
this.number = DialogHelper.getIntAttribute(context, attrs, "number", 0);
this.textSize = DialogHelper.getFloatAttribute(context, attrs, "textSize",
this.label = UIHelper.getAttribute(context, attrs, "label", "Number");
this.number = UIHelper.getIntAttribute(context, attrs, "number", 0);
this.textSize = UIHelper.getFloatAttribute(context, attrs, "textSize",
getResources().getDimension(R.dimen.regularTextSize));
this.color = ColorHelper.palette[7];

8
app/src/main/java/org/isoron/uhabits/views/RepetitionCountView.java
Unescape View File

@ -24,7 +24,7 @@ import android.util.AttributeSet;
import org.isoron.uhabits.R;
import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.helpers.DialogHelper;
import org.isoron.uhabits.helpers.UIHelper;
import org.isoron.uhabits.models.Habit;
import java.util.Calendar;
@ -38,9 +38,9 @@ public class RepetitionCountView extends NumberView implements HabitDataView
public RepetitionCountView(Context context, AttributeSet attrs)
{
super(context, attrs);
this.interval = DialogHelper.getIntAttribute(context, attrs, "interval", 7);
int labelValue = DialogHelper.getIntAttribute(context, attrs, "labelValue", 7);
String labelFormat = DialogHelper.getAttribute(context, attrs, "labelFormat",
this.interval = UIHelper.getIntAttribute(context, attrs, "interval", 7);
int labelValue = UIHelper.getIntAttribute(context, attrs, "labelValue", 7);
String labelFormat = UIHelper.getAttribute(context, attrs, "labelFormat",
getResources().getString(R.string.last_x_days));
setLabel(String.format(labelFormat, labelValue));

8
app/src/main/java/org/isoron/uhabits/views/RingView.java
Unescape View File

@ -33,7 +33,7 @@ import android.util.Log;
import android.view.View;
import org.isoron.uhabits.R;
import org.isoron.uhabits.helpers.DialogHelper;
import org.isoron.uhabits.helpers.UIHelper;
public class RingView extends View
{
@ -63,9 +63,9 @@ public class RingView extends View
{
super(context, attrs);
this.label = DialogHelper.getAttribute(context, attrs, "label", "Label");
this.maxDiameter = DialogHelper.getFloatAttribute(context, attrs, "maxDiameter", 100);
this.maxDiameter = DialogHelper.dpToPixels(context, maxDiameter);
this.label = UIHelper.getAttribute(context, attrs, "label", "Label");
this.maxDiameter = UIHelper.getFloatAttribute(context, attrs, "maxDiameter", 100);
this.maxDiameter = UIHelper.dpToPixels(context, maxDiameter);
init();
}

10
app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
Unescape View File

@ -34,7 +34,7 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.RemoteViews;
import org.isoron.uhabits.helpers.DialogHelper;
import org.isoron.uhabits.helpers.UIHelper;
import org.isoron.uhabits.R;
import org.isoron.uhabits.models.Habit;
@ -170,13 +170,13 @@ public abstract class BaseWidgetProvider extends AppWidgetProvider
if (options != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
{
maxWidth = (int) DialogHelper.dpToPixels(context,
maxWidth = (int) UIHelper.dpToPixels(context,
options.getInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH));
maxHeight = (int) DialogHelper.dpToPixels(context,
maxHeight = (int) UIHelper.dpToPixels(context,
options.getInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT));
minWidth = (int) DialogHelper.dpToPixels(context,
minWidth = (int) UIHelper.dpToPixels(context,
options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH));
minHeight = (int) DialogHelper.dpToPixels(context,
minHeight = (int) UIHelper.dpToPixels(context,
options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT));
}

Write Preview
Loading…
Cancel
Save