From 54a7691b70ad5823bbc228f05d3c3ed259d629cb Mon Sep 17 00:00:00 2001 From: Kosh Date: Sun, 9 Apr 2017 14:21:38 +0800 Subject: [PATCH] fixed returning to app when opening fasthub from different app. --- .../scheme/StackBuilderSchemeParser.java | 10 ++++ .../com/fastaccess/ui/base/BaseActivity.java | 1 - .../fastaccess/ui/modules/main/MainView.java | 16 +++---- .../layout/toolbar_activity_layout.xml | 47 +++++++++++-------- .../layout/add_banner_layout.xml | 2 +- 5 files changed, 45 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/com/fastaccess/provider/scheme/StackBuilderSchemeParser.java b/app/src/main/java/com/fastaccess/provider/scheme/StackBuilderSchemeParser.java index 52c026dc..95b4afc3 100644 --- a/app/src/main/java/com/fastaccess/provider/scheme/StackBuilderSchemeParser.java +++ b/app/src/main/java/com/fastaccess/provider/scheme/StackBuilderSchemeParser.java @@ -143,6 +143,7 @@ public class StackBuilderSchemeParser { if (issueNumber < 1) return null; return TaskStackBuilder.create(context) .addParentStack(MainView.class) + .addNextIntentWithParentStack(new Intent(context, MainView.class)) .addNextIntentWithParentStack(RepoPagerView.createIntent(context, repo, owner, RepoPagerMvp.PULL_REQUEST)) .addNextIntent(PullRequestPagerView.createIntent(context, repo, owner, issueNumber)); } @@ -175,6 +176,7 @@ public class StackBuilderSchemeParser { if (issueNumber < 1) return null; return TaskStackBuilder.create(context) .addParentStack(MainView.class) + .addNextIntentWithParentStack(new Intent(context, MainView.class)) .addNextIntentWithParentStack(RepoPagerView.createIntent(context, repo, owner, RepoPagerMvp.ISSUES)) .addNextIntent(IssuePagerView.createIntent(context, repo, owner, issueNumber)); } @@ -185,6 +187,7 @@ public class StackBuilderSchemeParser { String owner = segments.get(0); String repoName = segments.get(1); return TaskStackBuilder.create(context) + .addParentStack(MainView.class) .addNextIntentWithParentStack(new Intent(context, MainView.class)) .addNextIntent(RepoPagerView.createIntent(context, repoName, owner)); } @@ -203,6 +206,7 @@ public class StackBuilderSchemeParser { String owner = segments.get(0); String repoName = segments.get(1); return TaskStackBuilder.create(context) + .addParentStack(MainView.class) .addNextIntentWithParentStack(new Intent(context, MainView.class)) .addNextIntent(RepoPagerView.createIntent(context, repoName, owner)); } @@ -219,6 +223,7 @@ public class StackBuilderSchemeParser { String sha = segments.get(4); return TaskStackBuilder.create(context) .addParentStack(MainView.class) + .addNextIntentWithParentStack(new Intent(context, MainView.class)) .addNextIntentWithParentStack(RepoPagerView.createIntent(context, repoId, login)) .addNextIntent(CommitPagerView.createIntent(context, repoId, login, sha)); } @@ -233,6 +238,7 @@ public class StackBuilderSchemeParser { String sha = segments.get(3); return TaskStackBuilder.create(context) .addParentStack(MainView.class) + .addNextIntentWithParentStack(new Intent(context, MainView.class)) .addNextIntentWithParentStack(RepoPagerView.createIntent(context, repoId, login)) .addNextIntent(CommitPagerView.createIntent(context, repoId, login, sha)); } @@ -245,6 +251,7 @@ public class StackBuilderSchemeParser { .addNextIntent(UserPagerView.createIntent(context, segments.get(0))); } else if (segments != null && !segments.isEmpty() && segments.size() > 1 && segments.get(0).equalsIgnoreCase("orgs")) { return TaskStackBuilder.create(context) + .addParentStack(MainView.class) .addNextIntentWithParentStack(new Intent(context, MainView.class)) .addNextIntent(UserPagerView.createIntent(context, segments.get(1), true)); } @@ -273,6 +280,7 @@ public class StackBuilderSchemeParser { } if (fullUrl.length() > 0 && owner != null && repo != null) return TaskStackBuilder.create(context) .addParentStack(MainView.class) + .addNextIntentWithParentStack(new Intent(context, MainView.class)) .addNextIntentWithParentStack(RepoPagerView.createIntent(context, repo, owner)) .addNextIntentWithParentStack(RepoFilesActivity.getIntent(context, fullUrl.toString())) .addNextIntent(CodeViewerView.createIntent(context, fullUrl.toString())); @@ -283,6 +291,7 @@ public class StackBuilderSchemeParser { String repo = uri.getPathSegments().get(1); return TaskStackBuilder.create(context) .addParentStack(MainView.class) + .addNextIntentWithParentStack(new Intent(context, MainView.class)) .addNextIntentWithParentStack(RepoPagerView.createIntent(context, repo, owner)) .addNextIntentWithParentStack(RepoFilesActivity.getIntent(context, uri.toString())) .addNextIntent(CodeViewerView.createIntent(context, uri.toString())); @@ -304,6 +313,7 @@ public class StackBuilderSchemeParser { String repo = segments.get(1); return TaskStackBuilder.create(context) .addParentStack(MainView.class) + .addNextIntentWithParentStack(new Intent(context, MainView.class)) .addNextIntentWithParentStack(RepoPagerView.createIntent(context, repo, owner, RepoPagerMvp.ISSUES)) .addNextIntent(CreateIssueView.getIntent(context, owner, repo)); } diff --git a/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java b/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java index a9f8b7df..bc2d4efd 100644 --- a/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java +++ b/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java @@ -238,7 +238,6 @@ public abstract class BaseActivity implemen @BindView(R.id.fab) FloatingActionButton fab; private long backPressTimer; - @OnClick(R.id.fab) void onFilter() { - ActivityHelper.startReveal(this, CreateIssueView.getIntent(this, "K0shk0sh", "FastHub"), fab); - } + @OnClick(R.id.fab) void onFilter() {} @NonNull @Override public MainPresenter providePresenter() { return new MainPresenter(); @@ -163,11 +159,11 @@ public class MainView extends BaseActivity implemen } private void showHideFab() { - if (navType == MainMvp.ISSUES || navType == MainMvp.PULL_REQUESTS) { - fab.show(); - } else { - fab.hide(); - } +// if (navType == MainMvp.ISSUES || navType == MainMvp.PULL_REQUESTS) { +// fab.show(); +// } else { +// fab.hide(); +// } } private void superOnBackPressed(boolean didClickTwice) { diff --git a/app/src/main/res/layouts/main_layouts/layout/toolbar_activity_layout.xml b/app/src/main/res/layouts/main_layouts/layout/toolbar_activity_layout.xml index de3e1e4f..b06f6775 100644 --- a/app/src/main/res/layouts/main_layouts/layout/toolbar_activity_layout.xml +++ b/app/src/main/res/layouts/main_layouts/layout/toolbar_activity_layout.xml @@ -8,31 +8,40 @@ android:layout_height="match_parent" android:fitsSystemWindows="true"> - + android:layout_height="match_parent" + android:orientation="vertical"> - - - + android:layout_height="0dp" + android:layout_weight="1"> + + + + - + - + + + + \ No newline at end of file diff --git a/app/src/main/res/layouts/other_layouts/layout/add_banner_layout.xml b/app/src/main/res/layouts/other_layouts/layout/add_banner_layout.xml index 2e42c81c..dfa6ce3f 100644 --- a/app/src/main/res/layouts/other_layouts/layout/add_banner_layout.xml +++ b/app/src/main/res/layouts/other_layouts/layout/add_banner_layout.xml @@ -8,6 +8,6 @@ android:layout_height="wrap_content" android:background="?colorPrimary" android:visibility="gone" - ads:adSize="SMART_BANNER" + ads:adSize="BANNER" ads:adUnitId="@string/banner_ad_unit_id" tools:visibility="visible"/> \ No newline at end of file