archive-gh-me/FastHub
1
0
Fork 0
mirror of https://github.com/k0shk0sh/FastHub.git synced 2025-12-08 19:05:54 +00:00
Code Issues Projects Releases Wiki Activity

fixed returning to app when opening fasthub from different app.

Browse Source
This commit is contained in:
Kosh 2017-04-09 14:21:38 +08:00
parent 85d3d518d0
commit 54a7691b70
5 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/fastaccess/provider/scheme/StackBuilderSchemeParser.java
View File

@ -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));
}

1
app/src/main/java/com/fastaccess/ui/base/BaseActivity.java
View File

@ -238,7 +238,6 @@ public abstract class BaseActivity<V extends BaseMvp.FAView, P extends BasePrese
return true;
} else if (item.getItemId() == R.id.mainView) {
Intent intent = new Intent(this, MainView.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(intent);
finish();
}

16
app/src/main/java/com/fastaccess/ui/modules/main/MainView.java
View File

@ -15,7 +15,6 @@ import android.widget.Toast;
import com.fastaccess.R;
import com.fastaccess.data.dao.model.Notification;
import com.fastaccess.helper.ActivityHelper;
import com.fastaccess.helper.PrefGetter;
import com.fastaccess.helper.TypeFaceHelper;
import com.fastaccess.helper.ViewHelper;
@ -26,7 +25,6 @@ import com.fastaccess.ui.modules.main.donation.DonationView;
import com.fastaccess.ui.modules.notification.NotificationActivityView;
import com.fastaccess.ui.modules.pinned.PinnedReposActivity;
import com.fastaccess.ui.modules.repos.RepoPagerView;
import com.fastaccess.ui.modules.repos.issues.create.CreateIssueView;
import com.fastaccess.ui.modules.search.SearchView;
import com.fastaccess.ui.modules.settings.SettingsBottomSheetDialog;
@ -44,9 +42,7 @@ public class MainView extends BaseActivity<MainMvp.View, MainPresenter> 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<MainMvp.View, MainPresenter> 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) {

47
app/src/main/res/layouts/main_layouts/layout/toolbar_activity_layout.xml
View File

@ -8,31 +8,40 @@
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<android.support.design.widget.CoordinatorLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/appbar_elevation_dark"/>
<FrameLayout
android:id="@+id/fragmentContainer"
<android.support.design.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/scroll_behavior"/>
android:layout_height="0dp"
android:layout_weight="1">
<include layout="@layout/appbar_elevation_dark"/>
<FrameLayout
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/scroll_behavior"/>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
android:src="@drawable/ic_add"
android:tint="@color/white"
android:visibility="gone"
tools:visibility="visible"/>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
android:src="@drawable/ic_add"
android:tint="@color/white"
android:visibility="gone"
tools:visibility="visible"/>
</android.support.design.widget.CoordinatorLayout>
</android.support.design.widget.CoordinatorLayout>
<include layout="@layout/add_banner_layout"/>
</LinearLayout>
<include layout="@layout/nav_menu_layout"/>
</android.support.v4.widget.DrawerLayout>

2
app/src/main/res/layouts/other_layouts/layout/add_banner_layout.xml
View File

@ -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"/>