TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FixableErrorsActivity

Browse Source
This commit is contained in:
serso
2016-01-31 20:46:47 +01:00
parent 5f4d545511
commit af43970d9b
41 changed files with 539 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/solovyev/android/calculator/functions/EditFunctionFragment.java
View File

@@ -100,23 +100,23 @@ public class EditFunctionFragment extends BaseDialogFragment implements View.OnC
return fragment;
}
public static void showDialog(@Nonnull FragmentActivity activity) {
EditFunctionFragment.showDialog(null, activity.getSupportFragmentManager());
public static void show(@Nonnull FragmentActivity activity) {
EditFunctionFragment.show(null, activity.getSupportFragmentManager());
}
public static void showDialog(@Nullable CppFunction function, @Nonnull Context context) {
public static void show(@Nullable CppFunction function, @Nonnull Context context) {
if (!(context instanceof FunctionsActivity)) {
final Intent intent = new Intent(context, FunctionsActivity.class);
Activities.addIntentFlags(intent, false, context);
intent.putExtra(FunctionsActivity.EXTRA_FUNCTION, function);
context.startActivity(intent);
} else {
EditFunctionFragment.showDialog(function, ((FunctionsActivity) context).getSupportFragmentManager());
EditFunctionFragment.show(function, ((FunctionsActivity) context).getSupportFragmentManager());
}
}
public static void showDialog(@Nullable CppFunction input, @Nonnull FragmentManager fm) {
App.showDialog(create(input), "function-editor", fm);
public static void show(@Nullable CppFunction function, @Nonnull FragmentManager fm) {
App.showDialog(create(function), "function-editor", fm);
}
@Override

2
app/src/main/java/org/solovyev/android/calculator/functions/FunctionsActivity.java
View File

@@ -60,7 +60,7 @@ public class FunctionsActivity extends BaseActivity {
final Bundle extras = getIntent().getExtras();
final CppFunction function = extras != null ? (CppFunction) extras.getParcelable(EXTRA_FUNCTION) : null;
if (function != null) {
EditFunctionFragment.showDialog(function, this);
EditFunctionFragment.show(function, this);
}
}
}

4
app/src/main/java/org/solovyev/android/calculator/functions/FunctionsFragment.java
View File

@@ -71,7 +71,7 @@ public class FunctionsFragment extends BaseEntitiesFragment<Function> {
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
EditFunctionFragment.showDialog(getActivity());
EditFunctionFragment.show(getActivity());
}
});
return view;
@@ -95,7 +95,7 @@ public class FunctionsFragment extends BaseEntitiesFragment<Function> {
return true;
case R.string.c_edit:
if (function instanceof IFunction) {
EditFunctionFragment.showDialog(CppFunction.builder((IFunction) function).build(), activity.getSupportFragmentManager());
EditFunctionFragment.show(CppFunction.builder((IFunction) function).build(), activity.getSupportFragmentManager());
}
return true;
case R.string.c_remove: