Skip to content
This repository has been archived by the owner on May 24, 2021. It is now read-only.

Commit

Permalink
Fixed Bugs; Added missing Drawables;Increased Animation waiting Time;
Browse files Browse the repository at this point in the history
  • Loading branch information
rubengees committed Jun 12, 2015
1 parent ad8c0be commit 42fdf89
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ android {
applicationId "com.rubengees.vocables"
minSdkVersion 15
targetSdkVersion 22
versionCode 29
versionName "4.0.6"
versionCode 30
versionName "4.0.7"
}

buildTypes {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ private void showResult(Meaning result) {
AnimationUtils.animate(status, Techniques.FlipInX, 300, 0, new AnimationUtils.AnimationEndListener() {
@Override
public void onAnimationEnd() {
Utils.wait(getToolbarActivity(), 800, new Utils.OnWaitFinishedListener() {
Utils.wait(getToolbarActivity(), 1000, new Utils.OnWaitFinishedListener() {
@Override
public void onWaitFinished() {
next();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,17 +130,17 @@ private void showResult(Position first, Position second, Position result) {
Utils.setButtonColor(correctButton, Utils.getColor(getContext(), R.color.red));
}

AnimationUtils.animate(firstButton, Techniques.FadeOut, 300, 500, null);
AnimationUtils.animate(firstButton, Techniques.FadeOut, 300, 1000, null);
if (correctButton == null) {
AnimationUtils.animate(secondButton, Techniques.FadeOut, 300, 500, new AnimationUtils.AnimationEndListener() {
AnimationUtils.animate(secondButton, Techniques.FadeOut, 300, 1000, new AnimationUtils.AnimationEndListener() {
@Override
public void onAnimationEnd() {
animating = false;
next();
}
});
} else {
AnimationUtils.animate(correctButton, Techniques.FadeOut, 300, 500, new AnimationUtils.AnimationEndListener() {
AnimationUtils.animate(correctButton, Techniques.FadeOut, 300, 1000, new AnimationUtils.AnimationEndListener() {
@Override
public void onAnimationEnd() {
animating = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ private void showResult(Position answerPos, Position resultPos) {

waiting = true;
logic.onPause();
Utils.wait((Activity) getContext(), 500, new Utils.OnWaitFinishedListener() {
Utils.wait((Activity) getContext(), 1000, new Utils.OnWaitFinishedListener() {
@Override
public void onWaitFinished() {
waiting = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,6 @@ public void onPause() {

@Override
public void onTestFinished(TestResult result, TestSettings settings, ArrayList<Vocable> vocables) {
getFragmentManager().beginTransaction().replace(R.id.content, TestResultFragment.newInstance(mode, result, settings, vocables)).commit();
getActivity().getFragmentManager().beginTransaction().replace(R.id.content, TestResultFragment.newInstance(mode, result, settings, vocables)).commit();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
getToolbarActivity().enableFab(R.drawable.ic_again, new ExtendedToolbarActivity.OnFabClickListener() {
@Override
public void onFabClick() {
getFragmentManager().beginTransaction().replace(R.id.content, TestFragment.newInstance(mode, settings)).commit();
getActivity().getFragmentManager().beginTransaction().replace(R.id.content, TestFragment.newInstance(mode, settings)).commit();
}
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
@Override
public void onFabClick() {
if (vocableAmount >= mode.getMinAmount()) {
getFragmentManager().beginTransaction().replace(R.id.content, TestFragment.newInstance(mode, settings)).commit();
getActivity().getFragmentManager().beginTransaction().replace(R.id.content, TestFragment.newInstance(mode, settings)).commit();
} else {
SnackbarManager.show(Snackbar.with(getActivity()).text(getString(R.string.fragment_test_settings_error_not_enough_vocables) + " " + mode.getMinAmount())
.duration(Snackbar.SnackbarDuration.LENGTH_LONG).type(SnackbarType.MULTI_LINE), (ViewGroup) getActivity().findViewById(R.id.content));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ public void onCreate(Bundle savedInstanceState) {
if (savedInstanceState != null) {
mode = (SortMode) savedInstanceState.getSerializable(SORT_MODE);

VocableDialog vocableDialog = (VocableDialog) getFragmentManager().findFragmentByTag(
VocableDialog vocableDialog = (VocableDialog) getActivity().getFragmentManager().findFragmentByTag(
VOCABLE_DIALOG);
UnitDialog unitDialog = (UnitDialog) getFragmentManager().findFragmentByTag(UNIT_DIALOG);
SortDialog sortDialog = (SortDialog) getFragmentManager().findFragmentByTag(SORT_DIALOG);
DeleteDialog deleteDialog = (DeleteDialog) getFragmentManager().findFragmentByTag(DELETE_DIALOG);
UnitDialog unitDialog = (UnitDialog) getActivity().getFragmentManager().findFragmentByTag(UNIT_DIALOG);
SortDialog sortDialog = (SortDialog) getActivity().getFragmentManager().findFragmentByTag(SORT_DIALOG);
DeleteDialog deleteDialog = (DeleteDialog) getActivity().getFragmentManager().findFragmentByTag(DELETE_DIALOG);

if (vocableDialog != null) {
vocableDialog.setCallback(this);
Expand Down
Binary file added app/src/main/res/drawable-hdpi/ic_action_hint.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/ic_action_hint.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 42fdf89

Please sign in to comment.