archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Convert fields to local variables

Browse Source
Alex Baker 13 years ago
parent 2c264668e8
commit ae7e80a2f0
19 changed files with 57 additions and 93 deletions
Show Stats Download Patch File Download Diff File

9
astrid/common-src/com/localytics/android/LocalyticsSession.java
Unescape Escape View File

@ -224,11 +224,6 @@ public final class LocalyticsSession {
*/
private final Context mContext;
/**
* Localytics application key
*/
private final String mLocalyticsKey;
/**
* Keeps track of which Localytics clients are currently uploading, in order to allow only one upload for a given key at a
* time.
@ -268,9 +263,9 @@ public final class LocalyticsSession {
* and earlier. See <http://code.google.com/p/android/issues/detail?id=4469> for details.
*/
mContext = !(context.getClass().getName().equals("android.test.RenamingDelegatingContext")) && Constants.CURRENT_API_LEVEL >= 8 ? context.getApplicationContext() : context; //$NON-NLS-1$
mLocalyticsKey = key;
String localyticsKey = key;
mSessionHandler = new SessionHandler(mContext, mLocalyticsKey, sSessionHandlerThread.getLooper());
mSessionHandler = new SessionHandler(mContext, localyticsKey, sSessionHandlerThread.getLooper());
/*
* Complete Handler initialization on a background thread. Note that this is not generally a good best practice, as the

3
astrid/plugin-src/com/todoroo/astrid/calls/MissedCallActivity.java
Unescape Escape View File

@ -98,7 +98,6 @@ public class MissedCallActivity extends Activity {
private String name;
private String number;
private String timeString;
private TextView returnCallButton;
private TextView callLaterButton;
@ -118,7 +117,7 @@ public class MissedCallActivity extends Activity {
name = intent.getStringExtra(EXTRA_NAME);
number = intent.getStringExtra(EXTRA_NUMBER);
timeString = intent.getStringExtra(EXTRA_TIME);
String timeString = intent.getStringExtra(EXTRA_TIME);
long contactId = intent.getExtras().getLong(EXTRA_CONTACT_ID);
int color = ThemeService.getThemeColor();

5
astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java
Unescape Escape View File

@ -146,7 +146,6 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
private ListView listView;
private TextView filterName;
private boolean isDialog;
private CustomFilterAdapter adapter;
private final Map<String, CustomFilterCriterion> criteria = Collections.synchronizedMap(new LinkedHashMap<String, CustomFilterCriterion>());
@ -189,8 +188,8 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
}
private void setupForDialogOrFullscreen() {
isDialog = AstridPreferences.useTabletLayout(this);
if (isDialog) {
boolean dialog = AstridPreferences.useTabletLayout(this);
if (dialog) {
setTheme(ThemeService.getDialogTheme());
} else {
ThemeService.applyTheme(this);

3
astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
Unescape Escape View File

@ -59,7 +59,6 @@ public class FilesControlSet extends PopupControlSet {
private final ArrayList<TaskAttachment> files = new ArrayList<TaskAttachment>();
private final LinearLayout fileDisplayList;
private LinearLayout fileList;
private final LayoutInflater inflater;
private final ImageView image;
@ -151,7 +150,7 @@ public class FilesControlSet extends PopupControlSet {
@Override
protected void afterInflate() {
fileList = (LinearLayout) getView().findViewById(R.id.files_list);
LinearLayout fileList = (LinearLayout) getView().findViewById(R.id.files_list);
final LinearLayout finalList = fileList;
fileList.removeAllViews();
LayoutParams lp = new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT);

17
astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxControlSet.java
Unescape Escape View File

@ -214,9 +214,6 @@ public class OpencrxControlSet extends PopupControlSet {
private AutoCompleteTextView assignedToTextInput;
private AutoCompleteTextView creatorTextInput;
private ArrayList<OpencrxContact> users = null;
private ArrayList<OpencrxActivityCreator> dashboards = null;
@Autowired
private MetadataService metadataService;
@ -259,7 +256,7 @@ public class OpencrxControlSet extends PopupControlSet {
}
StoreObject[] dashboardsData = readStoreObjects(OpencrxActivityCreator.TYPE);
dashboards = new ArrayList<OpencrxActivityCreator>(dashboardsData.length);
ArrayList<OpencrxActivityCreator> dashboards = new ArrayList<OpencrxActivityCreator>(dashboardsData.length);
int dashboardSpinnerIndex = -1;
for (int i = 0; i < dashboardsData.length; i++) {
@ -314,20 +311,20 @@ public class OpencrxControlSet extends PopupControlSet {
}
StoreObject[] usersData = readStoreObjects(OpencrxContact.TYPE);
this.users = new ArrayList<OpencrxContact>();
ArrayList<OpencrxContact> users = new ArrayList<OpencrxContact>();
for (StoreObject user : usersData) {
this.users.add(new OpencrxContact(user));
users.add(new OpencrxContact(user));
}
ArrayAdapter<OpencrxContact> usersAdapter = new ArrayAdapter<OpencrxContact>(activity,
android.R.layout.simple_spinner_item, this.users);
android.R.layout.simple_spinner_item, users);
usersAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
assignedToSelector.setAdapter(usersAdapter);
int responsibleSpinnerIndex = 0;
for (int i = 0; i < this.users.size(); i++) {
if (this.users.get(i).getId() == responsibleId) {
for (int i = 0; i < users.size(); i++) {
if (users.get(i).getId() == responsibleId) {
responsibleSpinnerIndex = i;
break;
}
@ -335,7 +332,7 @@ public class OpencrxControlSet extends PopupControlSet {
assignedToSelector.setSelection(responsibleSpinnerIndex);
ArrayAdapter<OpencrxContact> contactAdapterTextInput = new ArrayAdapter<OpencrxContact>(activity,
android.R.layout.simple_spinner_item, this.users);
android.R.layout.simple_spinner_item, users);
assignedToTextInput.setAdapter(contactAdapterTextInput);
assignedToTextInput.setOnItemClickListener(new OnItemClickListener() {

4
astrid/plugin-src/com/todoroo/astrid/reminders/NotificationFragment.java
Unescape Escape View File

@ -50,8 +50,6 @@ public class NotificationFragment extends TaskListFragment {
// --- implementation
private long taskId;
/* (non-Javadoc)
* @see com.todoroo.astrid.activity.TaskListActivity#onActivityCreated(android.os.Bundle)
*/
@ -80,7 +78,7 @@ public class NotificationFragment extends TaskListFragment {
getView().findViewById(R.id.taskListFooter).setVisibility(View.GONE);
String title = extras.getString(Notifications.EXTRAS_TEXT);
taskId = extras.getLong(TOKEN_ID);
long taskId = extras.getLong(TOKEN_ID);
new ReminderDialog((AstridActivity) getActivity(), taskId, title).show();
}

46
astrid/plugin-src/com/todoroo/astrid/timers/TimerActionControlSet.java
Unescape Escape View File

@ -27,14 +27,34 @@ public class TimerActionControlSet extends TaskEditControlSet {
private final ImageView timerButton;
private final Chronometer chronometer;
private final LinearLayout timerContainer;
private boolean timerActive;
private final List<TimerActionListener> listeners = new LinkedList<TimerActionListener>();
public TimerActionControlSet(Activity activity, View parent) {
super(activity, -1);
timerContainer = (LinearLayout) parent.findViewById(R.id.timer_container);
LinearLayout timerContainer = (LinearLayout) parent.findViewById(R.id.timer_container);
timerButton = (ImageView) parent.findViewById(R.id.timer_button);
OnClickListener timerListener = new OnClickListener() {
@Override
public void onClick(View v) {
if (timerActive) {
TimerPlugin.updateTimer(activity, model, false);
for (TimerActionListener listener : listeners) {
listener.timerStopped(model);
}
chronometer.stop();
} else {
TimerPlugin.updateTimer(activity, model, true);
for (TimerActionListener listener : listeners) {
listener.timerStarted(model);
}
chronometer.start();
}
timerActive = !timerActive;
updateDisplay();
}
};
timerContainer.setOnClickListener(timerListener);
chronometer = (Chronometer) parent.findViewById(R.id.timer);
}
@ -61,28 +81,6 @@ public class TimerActionControlSet extends TaskEditControlSet {
return null;
}
private final OnClickListener timerListener = new OnClickListener() {
@Override
public void onClick(View v) {
if (timerActive) {
TimerPlugin.updateTimer(activity, model, false);
for (TimerActionListener listener : listeners) {
listener.timerStopped(model);
}
chronometer.stop();
} else {
TimerPlugin.updateTimer(activity, model, true);
for (TimerActionListener listener : listeners) {
listener.timerStarted(model);
}
chronometer.start();
}
timerActive = !timerActive;
updateDisplay();
}
};
private void updateDisplay() {
final int drawable;
if (timerActive) {

3
astrid/src/com/todoroo/astrid/activity/BeastModePreferences.java
Unescape Escape View File

@ -28,7 +28,6 @@ import java.util.HashMap;
public class BeastModePreferences extends ListActivity {
private TouchListView touchList;
private ArrayAdapter<String> adapter;
private ArrayList<String> items;
@ -145,7 +144,7 @@ public class BeastModePreferences extends ListActivity {
prefsToDescriptions = new HashMap<String, String>();
buildDescriptionMap(getResources());
touchList = (TouchListView) getListView();
TouchListView touchList = (TouchListView) getListView();
items = constructOrderedControlList(this);
adapter = new ArrayAdapter<String>(this, R.layout.preference_draggable_row, R.id.text, items) {

4
astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
Unescape Escape View File

@ -94,8 +94,6 @@ public class FilterListFragment extends SherlockListFragment {
private OnFilterItemClickedListener mListener;
private View newListButton;
/* ======================================================================
* ======================================================= initialization
* ====================================================================== */
@ -159,7 +157,7 @@ public class FilterListFragment extends SherlockListFragment {
getActivity().setDefaultKeyMode(Activity.DEFAULT_KEYS_SEARCH_LOCAL);
//ImageView backButton = (ImageView) getView().findViewById(R.id.back);
newListButton = getView().findViewById(R.id.new_list_button);
View newListButton = getView().findViewById(R.id.new_list_button);
if (newListButton != null) {
newListButton.setOnClickListener(new OnClickListener() {

10
astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
Unescape Escape View File

@ -225,12 +225,8 @@ public final class TaskEditFragment extends SherlockFragment implements
// --- UI components
private ImageButton voiceAddNoteButton;
private EditPeopleControlSet peopleControlSet = null;
private EditNotesControlSet notesControlSet = null;
private HideUntilControlSet hideUntilControls = null;
private TagsControlSet tagsControlSet = null;
private FilesControlSet filesControlSet = null;
private TimerActionControlSet timerAction;
private EditText title;
@ -486,7 +482,7 @@ public final class TaskEditFragment extends SherlockFragment implements
getActivity(), getView());
controls.add(timerAction);
tagsControlSet = new TagsControlSet(getActivity(),
TagsControlSet tagsControlSet = new TagsControlSet(getActivity(),
R.layout.control_set_tags,
R.layout.control_set_default_display, R.string.TEA_tags_label_long);
controls.add(tagsControlSet);
@ -551,7 +547,7 @@ public final class TaskEditFragment extends SherlockFragment implements
controlSetMap.put(getString(R.string.TEA_ctrl_reminders_pref),
reminderControl);
hideUntilControls = new HideUntilControlSet(getActivity(),
HideUntilControlSet hideUntilControls = new HideUntilControlSet(getActivity(),
R.layout.control_set_hide,
R.layout.control_set_default_display,
R.string.hide_until_prompt);
@ -717,7 +713,7 @@ public final class TaskEditFragment extends SherlockFragment implements
// prepare and set listener for voice-button
if (getActivity() != null) {
if (VoiceRecognizer.voiceInputAvailable(getActivity())) {
voiceAddNoteButton = (ImageButton) notesControlSet.getView().findViewById(
ImageButton voiceAddNoteButton = (ImageButton) notesControlSet.getView().findViewById(
R.id.voiceAddNoteButton);
voiceAddNoteButton.setVisibility(View.VISIBLE);
int prompt = R.string.voice_edit_note_prompt;

3
astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
Unescape Escape View File

@ -217,7 +217,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
protected OnCompletedTaskListener onCompletedTaskListener = null;
protected final int resource;
protected final LayoutInflater inflater;
private DetailLoaderThread detailLoader;
private int fontSize;
protected int applyListeners = APPLY_LISTENERS_PARENT;
private long mostRecentlyMade = -1;
@ -319,7 +318,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
private void startDetailThread() {
if (Preferences.getBoolean(R.string.p_showNotes, false) && !simpleLayout && !titleOnlyLayout) {
detailLoader = new DetailLoaderThread();
DetailLoaderThread detailLoader = new DetailLoaderThread();
detailLoader.start();
}
}

3
astrid/src/com/todoroo/astrid/billing/BillingActivity.java
Unescape Escape View File

@ -41,7 +41,6 @@ public class BillingActivity extends SherlockFragmentActivity implements AstridP
private static final int DIALOG_BILLING_NOT_SUPPORTED_ID = 2;
private static final int DIALOG_SUBSCRIPTIONS_NOT_SUPPORTED_ID = 3;
private Handler handler;
private BillingService billingService;
private AstridPurchaseObserver purchaseObserver;
private Button buyMonth;
@ -67,7 +66,7 @@ public class BillingActivity extends SherlockFragmentActivity implements AstridP
setupText();
handler = new Handler();
Handler handler = new Handler();
billingService = new BillingService();
billingService.setContext(this);
purchaseObserver = new AstridPurchaseObserver(this, handler) {

4
astrid/src/com/todoroo/astrid/ui/CalendarDialog.java
Unescape Escape View File

@ -23,8 +23,6 @@ public class CalendarDialog extends Dialog implements OnClickListener, OnSelecte
private final Button cancelButton;
private Date calendarDate;
private final CalendarView calendarView;
public CalendarDialog(Context context, Date calendarDate) {
super(context);
this.calendarDate = calendarDate;
@ -40,7 +38,7 @@ public class CalendarDialog extends Dialog implements OnClickListener, OnSelecte
cancelButton = (Button) findViewById(R.id.CancelButton);
calendarView = (CalendarView) findViewById(R.id.CalendarView);
CalendarView calendarView = (CalendarView) findViewById(R.id.CalendarView);
calendarView.setCalendarDate(calendarDate);
calendarView.setOnSelectedDateListener(this);

9
astrid/src/com/todoroo/astrid/ui/CalendarView.java
Unescape Escape View File

@ -43,16 +43,13 @@ public class CalendarView extends View {
private float deltaX;
private boolean ignoreNextTouch;
private Paint borderPaint;
private Paint calendarNumberRightAlignPaint;
private Paint calendarSelectedNumberRightAlignPaint;
private Paint backgroundColorPaint;
private Paint monthCenterAlignLargePaint;
private Paint centerAlignPaint;
private Paint rightAlignPaint;
private Paint todayCalendarPaint;
private Paint selectedCalendarPaint;
private Paint dayPaint;
private float density;
private int leftArrowHeight;
@ -110,7 +107,7 @@ public class CalendarView extends View {
Resources r = context.getResources();
borderPaint = new Paint();
Paint borderPaint = new Paint();
borderPaint.setAntiAlias(true);
borderPaint.setColor(r.getColor(R.color.task_edit_deadline_gray));
borderPaint.setStyle(Style.STROKE);
@ -127,7 +124,7 @@ public class CalendarView extends View {
calendarSelectedNumberRightAlignPaint.setTextSize(TEXT_SIZE * density);
calendarSelectedNumberRightAlignPaint.setTextAlign(Paint.Align.RIGHT);
dayPaint = new Paint();
Paint dayPaint = new Paint();
dayPaint.setAntiAlias(true);
dayPaint.setColor(Color.rgb(137, 135, 132));
@ -137,7 +134,7 @@ public class CalendarView extends View {
monthCenterAlignLargePaint.setTextAlign(Paint.Align.CENTER);
monthCenterAlignLargePaint.setTextSize(MONTH_TEXT_SIZE * density);
centerAlignPaint = new Paint();
Paint centerAlignPaint = new Paint();
centerAlignPaint.setAntiAlias(true);
centerAlignPaint.setColor(r.getColor(R.color.task_edit_deadline_gray));
centerAlignPaint.setTextAlign(Paint.Align.CENTER);

6
astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java
Unescape Escape View File

@ -25,8 +25,6 @@ public class DateAndTimeDialog extends Dialog {
}
private final DateAndTimePicker dateAndTimePicker;
private final Button okButton;
private final Button cancelButton;
private boolean cancelled = false;
private DateAndTimeDialogListener listener;
@ -54,8 +52,8 @@ public class DateAndTimeDialog extends Dialog {
dateAndTimePicker = (DateAndTimePicker) findViewById(R.id.date_and_time);
dateAndTimePicker.initializeWithDate(startDate);
okButton = (Button) findViewById(R.id.ok);
cancelButton = (Button) findViewById(R.id.cancel);
Button okButton = (Button) findViewById(R.id.ok);
Button cancelButton = (Button) findViewById(R.id.cancel);
okButton.setOnClickListener(new View.OnClickListener() {
@Override

4
astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java
Unescape Escape View File

@ -35,8 +35,6 @@ public class DateAndTimePicker extends LinearLayout {
private static final int SHORTCUT_PADDING = 8;
private ArrayList<UrgencyValue> urgencyValues;
private class UrgencyValue {
public String label;
public int setting;
@ -158,7 +156,7 @@ public class DateAndTimePicker extends LinearLayout {
}
String[] labels = context.getResources().getStringArray(arrayResource);
urgencyValues = new ArrayList<UrgencyValue>();
ArrayList<UrgencyValue> urgencyValues = new ArrayList<UrgencyValue>();
todayUrgency = new UrgencyValue(labels[2],
Task.URGENCY_TODAY);
if (useShortcuts) {

6
astrid/src/com/todoroo/astrid/ui/NumberPicker.java
Unescape Escape View File

@ -81,9 +81,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
}
};
private final LayoutInflater mInflater;
private final EditText mText;
private final InputFilter mInputFilter;
private final InputFilter mNumberInputFilter;
private final Animation mSlideUpOutAnimation;
@ -126,10 +124,10 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
public NumberPicker(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs);
setOrientation(VERTICAL);
mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
LayoutInflater mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
mInflater.inflate(getLayout(), this, true);
mHandler = new Handler();
mInputFilter = new NumberPickerInputFilter();
InputFilter mInputFilter = new NumberPickerInputFilter();
mNumberInputFilter = new NumberRangeKeyListener();
mIncrementButton = (NumberPickerButton) findViewById(R.id.increment);
mIncrementButton.setOnClickListener(this);

8
astrid/src/com/todoroo/astrid/ui/RandomReminderControlSet.java
Unescape Escape View File

@ -26,10 +26,6 @@ import com.todoroo.astrid.service.StatisticsService;
* @author Tim Su <tim@todoroo.com>
*/
public class RandomReminderControlSet extends TaskEditControlSet {
/**
* default interval for spinner if date is unselected
*/
private final long DEFAULT_INTERVAL = DateUtilities.ONE_WEEK * 2;
private final CheckBox settingCheckbox;
private final Spinner periodSpinner;
@ -83,6 +79,10 @@ public class RandomReminderControlSet extends TaskEditControlSet {
boolean enabled = time > 0;
if (time <= 0) {
/*
default interval for spinner if date is unselected
*/
long DEFAULT_INTERVAL = DateUtilities.ONE_WEEK * 2;
time = DEFAULT_INTERVAL;
}

3
astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
Unescape Escape View File

@ -41,7 +41,6 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
private Account[] accounts;
private CirclePageIndicator mIndicator;
private View currentView;
private int currentPage;
private String authToken;
private boolean onSuccess = false;
@ -210,7 +209,7 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
}
public void onPageChanged(View view, int position) {
currentPage = position;
int currentPage = position;
currentView = view;
findViewById(R.id.next).setVisibility(
position == mAdapter.getCount() - 1 ? View.GONE : View.VISIBLE);

Write Preview
Loading…
Cancel
Save