Skip to content

fix a bug that mainActivity shows up when dismiss splashActivity #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zuosus wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix a bug that mainActivity shows up when dismiss splashActivity #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e74a5af
fix a bug that mainActivity shows up when dismiss splashActivity
Dec 3, 2016
745c96f
remove wrong import
Dec 3, 2016
72bc749
close drawer when tap on back button
Dec 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions app/src/main/java/com/hotbitmapgg/moequest/module/commonality/AppSplashActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ public class AppSplashActivity extends Activity

private Subscription subscribe;

private AnimatorSet mSplashSet;

@Override
protected void onCreate(Bundle savedInstanceState)
{
Expand Down Expand Up @@ -65,11 +67,11 @@ private void startAnim()
ObjectAnimator animatorX = ObjectAnimator.ofFloat(mSplashImage, "scaleX", 1f, SCALE_END);
ObjectAnimator animatorY = ObjectAnimator.ofFloat(mSplashImage, "scaleY", 1f, SCALE_END);

AnimatorSet set = new AnimatorSet();
set.setDuration(ANIMATION_TIME).play(animatorX).with(animatorY);
set.start();
mSplashSet = new AnimatorSet();
mSplashSet.setDuration(ANIMATION_TIME).play(animatorX).with(animatorY);
mSplashSet.start();

set.addListener(new AnimatorListenerAdapter()
mSplashSet.addListener(new AnimatorListenerAdapter()
{

@Override
Expand All @@ -92,6 +94,9 @@ public void onBackPressed()
{
subscribe.unsubscribe();
}
if (mSplashSet != null) {
mSplashSet.removeAllListeners();
}
}

}
10 changes: 8 additions & 2 deletions app/src/main/java/com/hotbitmapgg/moequest/module/commonality/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.widget.Toolbar;
import android.view.Gravity;
import android.view.KeyEvent;
import android.view.MenuItem;
import android.view.View;
Expand Down Expand Up @@ -198,7 +199,7 @@ public void changIndex(int changNum, String title, MenuItem item)
}


public void switchFragment(Fragment fragment)
private void switchFragment(Fragment fragment)
{

FragmentTransaction trx = getSupportFragmentManager().beginTransaction();
Expand All @@ -218,7 +219,12 @@ public boolean onKeyDown(int keyCode, KeyEvent event)

if (keyCode == KeyEvent.KEYCODE_BACK)
{
logoutApp();

if (mNavigationView.isShown()) {
mDrawerLayout.closeDrawer(Gravity.START);
} else {
logoutApp();
}
}

return true;
Expand Down