upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-02 09:33:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup, remove fragmentActivity as instance variable inside fragments

Browse Source
This commit is contained in:
Jimmy Shih
2013-12-26 17:17:10 -08:00
parent 5bc7f2f973
commit 76e44794ff
8 changed files with 27 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/fragments/AboutDialogFragment.java
+1 -2
View File
@@ -50,7 +50,6 @@ public class AboutDialogFragment extends AbstractMyTracksDialogFragment {
public static final String ABOUT_DIALOG_TAG = "aboutDialog";
private AboutCaller caller;
private FragmentActivity fragmentActivity;
@Override
public void onAttach(Activity activity) {
@@ -65,7 +64,7 @@ public class AboutDialogFragment extends AbstractMyTracksDialogFragment {
@Override
protected Dialog createDialog() {
fragmentActivity = getActivity();
FragmentActivity fragmentActivity = getActivity();
View view = fragmentActivity.getLayoutInflater().inflate(R.layout.about, null);
TextView aboutVersion = (TextView) view.findViewById(R.id.about_version);
aboutVersion.setText(SystemUtils.getMyTracksVersion(fragmentActivity));
MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseAccountDialogFragment.java
+4 -5
View File
@@ -53,7 +53,6 @@ public class ChooseAccountDialogFragment extends AbstractMyTracksDialogFragment
public static final String CHOOSE_ACCOUNT_DIALOG_TAG = "chooseAccount";
private ChooseAccountCaller caller;
private FragmentActivity fragmentActivity;
private Account[] accounts;
@Override
@@ -70,7 +69,7 @@ public class ChooseAccountDialogFragment extends AbstractMyTracksDialogFragment
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
fragmentActivity = getActivity();
FragmentActivity fragmentActivity = getActivity();
accounts = AccountManager.get(fragmentActivity).getAccountsByType(Constants.ACCOUNT_TYPE);
if (accounts.length == 1) {
@@ -94,7 +93,7 @@ public class ChooseAccountDialogFragment extends AbstractMyTracksDialogFragment
@Override
protected Dialog createDialog() {
if (accounts.length == 0) {
return new AlertDialog.Builder(fragmentActivity).setMessage(
return new AlertDialog.Builder(getActivity()).setMessage(
R.string.send_google_no_account_message).setTitle(R.string.send_google_no_account_title)
.setPositiveButton(R.string.generic_ok, null).create();
}
@@ -102,14 +101,14 @@ public class ChooseAccountDialogFragment extends AbstractMyTracksDialogFragment
for (int i = 0; i < accounts.length; i++) {
choices[i] = accounts[i].name;
}
return new AlertDialog.Builder(fragmentActivity).setNegativeButton(
return new AlertDialog.Builder(getActivity()).setNegativeButton(
R.string.generic_cancel, null)
.setPositiveButton(R.string.generic_ok, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
int position = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
PreferencesUtils.setString(
fragmentActivity, R.string.google_account_key, accounts[position].name);
getActivity(), R.string.google_account_key, accounts[position].name);
caller.onChooseAccountDone();
}
}).setSingleChoiceItems(choices, 0, null)
MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityDialogFragment.java
+4 -5
View File
@@ -64,7 +64,6 @@ public class ChooseActivityDialogFragment extends AbstractMyTracksDialogFragment
public static final String CHOOSE_ACTIVITY_DIALOG_TAG = "chooseActivityDialog";
private ChooseActivityCaller caller;
private FragmentActivity fragmentActivity;
private PackageManager packageManager;
@Override
@@ -80,9 +79,9 @@ public class ChooseActivityDialogFragment extends AbstractMyTracksDialogFragment
@Override
protected Dialog createDialog() {
fragmentActivity = getActivity();
FragmentActivity fragmentActivity = getActivity();
packageManager = fragmentActivity.getPackageManager();
List<DisplayInfo> displayInfos = getDisplayInfos();
List<DisplayInfo> displayInfos = getDisplayInfos(fragmentActivity);
ArrayAdapter<DisplayInfo> arrayAdapter = new ArrayAdapter<DisplayInfo>(fragmentActivity,
R.layout.choose_activity_list_item, R.id.choose_activity_list_item_text1, displayInfos) {
@@ -90,7 +89,7 @@ public class ChooseActivityDialogFragment extends AbstractMyTracksDialogFragment
public View getView(int position, View convertView, ViewGroup parent) {
View view;
if (convertView == null) {
view = fragmentActivity.getLayoutInflater()
view = getActivity().getLayoutInflater()
.inflate(R.layout.choose_activity_list_item, parent, false);
} else {
view = convertView;
@@ -134,7 +133,7 @@ public class ChooseActivityDialogFragment extends AbstractMyTracksDialogFragment
/**
* Gets the display info.
*/
private List<DisplayInfo> getDisplayInfos() {
private List<DisplayInfo> getDisplayInfos(FragmentActivity fragmentActivity) {
List<DisplayInfo> displayInfos = new ArrayList<DisplayInfo>();
Intent intent = ShareCompat.IntentBuilder.from(fragmentActivity)
.setType(IntentUtils.TEXT_PLAIN_TYPE).getIntent();
MyTracks/src/com/google/android/apps/mytracks/fragments/ConfirmSyncDialogFragment.java
+2 -3
View File
@@ -50,7 +50,6 @@ public class ConfirmSyncDialogFragment extends AbstractMyTracksDialogFragment {
public static final String CONFIRM_SYNC_DIALOG_TAG = "confirmSyncDialog";
private ConfirmSyncCaller caller;
private FragmentActivity fragmentActivity;
@Override
public void onAttach(Activity activity) {
@@ -66,9 +65,8 @@ public class ConfirmSyncDialogFragment extends AbstractMyTracksDialogFragment {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
fragmentActivity = getActivity();
if (PreferencesUtils.getBoolean(
fragmentActivity, R.string.drive_sync_key, PreferencesUtils.DRIVE_SYNC_DEFAULT)) {
getActivity(), R.string.drive_sync_key, PreferencesUtils.DRIVE_SYNC_DEFAULT)) {
dismiss();
caller.onConfirmSyncDone(false);
return;
@@ -77,6 +75,7 @@ public class ConfirmSyncDialogFragment extends AbstractMyTracksDialogFragment {
@Override
protected Dialog createDialog() {
FragmentActivity fragmentActivity = getActivity();
String googleAccount = PreferencesUtils.getString(
fragmentActivity, R.string.google_account_key, PreferencesUtils.GOOGLE_ACCOUNT_DEFAULT);
String message = getString(
MyTracks/src/com/google/android/apps/mytracks/fragments/EnableSyncDialogFragment.java
+2 -4
View File
@@ -50,7 +50,6 @@ public class EnableSyncDialogFragment extends AbstractMyTracksDialogFragment {
public static final String ENABLE_SYNC_DIALOG_TAG = "enableSyncDialog";
private EnableSyncCaller caller;
private FragmentActivity fragmentActivity;
@Override
public void onAttach(Activity activity) {
@@ -66,9 +65,8 @@ public class EnableSyncDialogFragment extends AbstractMyTracksDialogFragment {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
fragmentActivity = getActivity();
if (PreferencesUtils.getBoolean(
fragmentActivity, R.string.drive_sync_key, PreferencesUtils.DRIVE_SYNC_DEFAULT)) {
getActivity(), R.string.drive_sync_key, PreferencesUtils.DRIVE_SYNC_DEFAULT)) {
dismiss();
caller.onEnableSyncDone(false);
return;
@@ -77,7 +75,7 @@ public class EnableSyncDialogFragment extends AbstractMyTracksDialogFragment {
@Override
protected Dialog createDialog() {
return new AlertDialog.Builder(fragmentActivity).setMessage(R.string.sync_drive_enable_message)
return new AlertDialog.Builder(getActivity()).setMessage(R.string.sync_drive_enable_message)
.setNegativeButton(R.string.generic_no, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
MyTracks/src/com/google/android/apps/mytracks/fragments/EulaDialogFragment.java
+3 -7
View File
@@ -24,7 +24,6 @@ import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.text.SpannableString;
import android.text.method.LinkMovementMethod;
import android.text.util.Linkify;
@@ -71,7 +70,6 @@ public class EulaDialogFragment extends AbstractMyTracksDialogFragment {
}
private EulaCaller caller;
private FragmentActivity fragmentActivity;
@Override
public void onAttach(Activity activity) {
@@ -86,14 +84,12 @@ public class EulaDialogFragment extends AbstractMyTracksDialogFragment {
@Override
protected Dialog createDialog() {
fragmentActivity = getActivity();
boolean hasAccepted = getArguments().getBoolean(KEY_HAS_ACCEPTED);
SpannableString message = new SpannableString(getEulaText());
Linkify.addLinks(message, Linkify.WEB_URLS);
AlertDialog.Builder builder = new AlertDialog.Builder(fragmentActivity).setMessage(message)
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()).setMessage(message)
.setTitle(R.string.eula_title);
if (hasAccepted) {
@@ -115,7 +111,7 @@ public class EulaDialogFragment extends AbstractMyTracksDialogFragment {
}).setPositiveButton(R.string.eula_accept, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
EulaUtils.setAcceptEula(fragmentActivity);
EulaUtils.setAcceptEula(getActivity());
caller.onEulaDone();
}
});
@@ -128,7 +124,7 @@ public class EulaDialogFragment extends AbstractMyTracksDialogFragment {
super.onStart();
TextView textView = (TextView) getDialog().findViewById(android.R.id.message);
textView.setMovementMethod(LinkMovementMethod.getInstance());
textView.setTextAppearance(fragmentActivity, R.style.TextSmall);
textView.setTextAppearance(getActivity(), R.style.TextSmall);
}
@Override
MyTracks/src/com/google/android/apps/mytracks/fragments/FrequencyDialogFragment.java
+9 -12
View File
@@ -50,35 +50,32 @@ public class FrequencyDialogFragment extends AbstractMyTracksDialogFragment {
frequencyDialogFragment.setArguments(bundle);
return frequencyDialogFragment;
}
private FragmentActivity fragmentActivity;
@Override
protected Dialog createDialog() {
fragmentActivity = getActivity();
FragmentActivity fragmentActivity = getActivity();
final int preferenceId = getArguments().getInt(KEY_PREFERENCE_ID);
int defaultValue = getArguments().getInt(KEY_DEFAULT_VALUE);
int titleId = getArguments().getInt(KEY_TITLE_ID);
int frequencyValue = PreferencesUtils.getInt(fragmentActivity, preferenceId, defaultValue);
return new AlertDialog.Builder(fragmentActivity)
.setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
@Override
return new AlertDialog.Builder(fragmentActivity).setPositiveButton(
R.string.generic_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
int listIndex = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
PreferencesUtils.setInt(fragmentActivity, preferenceId, getFrequencyValue(listIndex));
PreferencesUtils.setInt(getActivity(), preferenceId, getFrequencyValue(listIndex));
}
})
.setSingleChoiceItems(getFrequencyDisplayOptions(), getListIndex(frequencyValue), null)
.setTitle(titleId)
.create();
}).setSingleChoiceItems(
getFrequencyDisplayOptions(fragmentActivity), getListIndex(frequencyValue), null)
.setTitle(titleId).create();
}
/**
* Gets the frequency display options.
*/
private String[] getFrequencyDisplayOptions() {
private String[] getFrequencyDisplayOptions(FragmentActivity fragmentActivity) {
boolean metricUnits = PreferencesUtils.isMetricUnits(fragmentActivity);
return StringUtils.getFrequencyOptions(fragmentActivity, metricUnits);
}
MyTracks/src/com/google/android/apps/mytracks/fragments/InstallEarthDialogFragment.java
+2 -6
View File
@@ -25,7 +25,6 @@ import android.content.ActivityNotFoundException;
import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.support.v4.app.FragmentActivity;
import android.widget.Toast;
/**
@@ -37,12 +36,9 @@ public class InstallEarthDialogFragment extends AbstractMyTracksDialogFragment {
public static final String INSTALL_EARTH_DIALOG_TAG = "installEarthDialog";
private FragmentActivity fragmentActivity;
@Override
protected Dialog createDialog() {
fragmentActivity = getActivity();
return new AlertDialog.Builder(fragmentActivity).setMessage(
return new AlertDialog.Builder(getActivity()).setMessage(
R.string.track_detail_install_earth_message).setNegativeButton(R.string.generic_no, null)
.setPositiveButton(R.string.generic_yes, new DialogInterface.OnClickListener() {
@Override
@@ -53,7 +49,7 @@ public class InstallEarthDialogFragment extends AbstractMyTracksDialogFragment {
startActivity(intent);
} catch (ActivityNotFoundException e) {
Toast.makeText(
fragmentActivity, R.string.track_detail_install_earth_error, Toast.LENGTH_LONG)
getActivity(), R.string.track_detail_install_earth_error, Toast.LENGTH_LONG)
.show();
}
}