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

providing proper backstack to fix #38, no the app should have better backstack handling.

Browse Source
This commit is contained in:
Kosh 2017-03-02 22:13:37 +08:00
parent eea9363854
commit 703141f8d9
6 changed files with 336 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/src/main/AndroidManifest.xml
View File

@ -43,18 +43,33 @@
<activity
android:name=".ui.modules.user.UserPagerView"
android:excludeFromRecents="true"
android:label="@string/user"
android:excludeFromRecents="true"/>
android:parentActivityName=".ui.modules.main.MainView">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.modules.main.MainView"/>
</activity>
<activity
android:name=".ui.modules.repos.RepoPagerView"
android:excludeFromRecents="true"
android:label="@string/repo"
android:excludeFromRecents="true"/>
android:parentActivityName=".ui.modules.main.MainView">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.modules.main.MainView"/>
</activity>
<activity
android:name=".ui.modules.repos.issues.issue.details.IssuePagerView"
android:excludeFromRecents="true"
android:label="@string/issue"
android:excludeFromRecents="true"/>
android:parentActivityName=".ui.modules.repos.RepoPagerView">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.modules.repos.RepoPagerView"/>
</activity>
<activity
android:name=".ui.modules.repos.issues.create.CreateIssueView"
android:configChanges="keyboard|orientation|screenSize"
@ -63,19 +78,34 @@
<activity
android:name=".ui.modules.repos.pull_requests.pull_request.details.PullRequestPagerView"
android:excludeFromRecents="true"
android:label="@string/pull_request"
android:excludeFromRecents="true"/>
android:parentActivityName=".ui.modules.repos.RepoPagerView">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.modules.repos.RepoPagerView"/>
</activity>
<activity
android:name=".ui.modules.repos.code.commit.details.CommitPagerView"
android:excludeFromRecents="true"
android:label="@string/commit"
android:excludeFromRecents="true"/>
android:parentActivityName=".ui.modules.repos.RepoPagerView">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.modules.repos.RepoPagerView"/>
</activity>
<activity
android:name=".ui.modules.code.CodeViewerView"
android:configChanges="keyboard|orientation|screenSize"
android:excludeFromRecents="true"
android:label="@string/viewer"
android:excludeFromRecents="true"/>
android:parentActivityName=".ui.modules.main.MainView">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.modules.main.MainView"/>
</activity>
<activity
android:name=".ui.modules.editor.EditorView"
@ -91,15 +121,25 @@
<activity
android:name=".ui.modules.gists.gist.GistView"
android:excludeFromRecents="true"
android:label="@string/gist"
android:excludeFromRecents="true"/>
android:parentActivityName=".ui.modules.main.MainView">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.modules.main.MainView"/>
</activity>
<activity android:name=".ui.modules.search.SearchView"/>
<activity
android:name=".ui.modules.notification.NotificationActivityView"
android:excludeFromRecents="true"
android:label="@string/notifictions"
android:excludeFromRecents="true"/>
android:parentActivityName=".ui.modules.main.MainView">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.modules.main.MainView"/>
</activity>
<activity
android:name=".ui.modules.parser.LinksParserActivity"

7
app/src/main/java/com/fastaccess/provider/scheme/SchemeParser.java
View File

@ -35,11 +35,8 @@ public class SchemeParser {
private static final String PROTOCOL_HTTPS = "https";
public static void launchUri(@NonNull Context context, @NonNull Intent data) {
Intent intent = convert(context, data);
if (intent != null) {
context.startActivity(intent);
} else {
ActivityHelper.forceOpenInBrowser(context, data.getData());
if (data.getData() != null) {
launchUri(context, data.getData());
}
}

278
app/src/main/java/com/fastaccess/provider/scheme/StackBuilderSchemeParser.java Normal file
View File

@ -0,0 +1,278 @@
package com.fastaccess.provider.scheme;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.TaskStackBuilder;
import android.text.TextUtils;
import com.annimon.stream.Optional;
import com.annimon.stream.Stream;
import com.fastaccess.helper.ActivityHelper;
import com.fastaccess.helper.InputHelper;
import com.fastaccess.ui.modules.code.CodeViewerView;
import com.fastaccess.ui.modules.gists.gist.GistView;
import com.fastaccess.ui.modules.main.MainView;
import com.fastaccess.ui.modules.repos.RepoPagerView;
import com.fastaccess.ui.modules.repos.code.commit.details.CommitPagerView;
import com.fastaccess.ui.modules.repos.issues.issue.details.IssuePagerView;
import com.fastaccess.ui.modules.repos.pull_requests.pull_request.details.PullRequestPagerView;
import com.fastaccess.ui.modules.user.UserPagerView;
import java.util.List;
import static android.content.Intent.ACTION_VIEW;
/**
* Created by Kosh on 09 Dec 2016, 4:44 PM
*/
public class StackBuilderSchemeParser {
private static final String HOST_DEFAULT = "github.com";
private static final String HOST_GISTS = "gist.github.com";
private static final String RAW_AUTHORITY = "raw.githubusercontent.com";
private static final String API_AUTHORITY = "api.github.com";
private static final String PROTOCOL_HTTPS = "https";
public static void launchUri(@NonNull Context context, @NonNull Intent data) {
if (data.getData() != null) {
launchUri(context, data.getData());
}
}
public static void launchUri(@NonNull Context context, @NonNull Uri data) {
TaskStackBuilder intent = convert(context, data);
if (intent != null) {
intent.startActivities();
} else {
ActivityHelper.forceOpenInBrowser(context, data);
}
}
@Nullable private static TaskStackBuilder convert(@NonNull Context context, final Intent intent) {
if (intent == null) return null;
if (!ACTION_VIEW.equals(intent.getAction())) return null;
Uri data = intent.getData();
return convert(context, data);
}
@Nullable private static TaskStackBuilder convert(@NonNull Context context, Uri data) {
if (data == null) return null;
if (InputHelper.isEmpty(data.getHost()) || InputHelper.isEmpty(data.getScheme())) {
String host = data.getHost();
if (InputHelper.isEmpty(host)) host = HOST_DEFAULT;
String scheme = data.getScheme();
if (InputHelper.isEmpty(scheme)) scheme = PROTOCOL_HTTPS;
String prefix = scheme + "://" + host;
String path = data.getPath();
if (!InputHelper.isEmpty(path)) {
if (path.charAt(0) == '/') {
data = Uri.parse(prefix + path);
} else {
data = Uri.parse(prefix + '/' + path);
}
} else {
data = Uri.parse(prefix);
}
}
return getIntentForURI(context, data);
}
@Nullable private static TaskStackBuilder getIntentForURI(@NonNull Context context, @NonNull Uri data) {
if (HOST_GISTS.equals(data.getHost())) {
String gist = getGistId(data);
if (gist != null) {
return TaskStackBuilder.create(context)
.addParentStack(MainView.class)
.addNextIntent(GistView.createIntent(context, gist));
}
} else {
String authority = data.getAuthority();
if (TextUtils.equals(authority, HOST_DEFAULT) || TextUtils.equals(authority, RAW_AUTHORITY) ||
TextUtils.equals(authority, API_AUTHORITY)) {
TaskStackBuilder userIntent = getUser(context, data);
TaskStackBuilder pullRequestIntent = getPullRequestIntent(context, data);
TaskStackBuilder issueIntent = getIssueIntent(context, data);
TaskStackBuilder repoIntent = getRepo(context, data);
TaskStackBuilder commit = getCommit(context, data);
TaskStackBuilder commits = getCommits(context, data);
TaskStackBuilder blob = getBlob(context, data);
Optional<TaskStackBuilder> intentOptional = returnNonNull(userIntent, pullRequestIntent, commit, commits,
issueIntent, repoIntent, blob);
Optional<TaskStackBuilder> empty = Optional.empty();
if (intentOptional != null && intentOptional.isPresent() && intentOptional != empty) {
return intentOptional.get();
} else {
return getGeneralRepo(context, data);
}
}
}
return null;
}
@Nullable private static TaskStackBuilder getPullRequestIntent(@NonNull Context context, @NonNull Uri uri) {
List<String> segments = uri.getPathSegments();
if (segments == null || segments.size() < 4) return null;
String owner;
String repo;
String number;
if ("pull".equals(segments.get(2))) {
owner = segments.get(0);
repo = segments.get(1);
number = segments.get(3);
} else if ("pull".equals(segments.get(3))) {//notifications url.
owner = segments.get(1);
repo = segments.get(2);
number = segments.get(4);
} else {
return null;
}
if (InputHelper.isEmpty(number))
return null;
int issueNumber;
try {
issueNumber = Integer.parseInt(number);
} catch (NumberFormatException nfe) {
return null;
}
if (issueNumber < 1) return null;
return TaskStackBuilder.create(context)
.addNextIntentWithParentStack(RepoPagerView.createIntent(context, repo, owner))
.addNextIntent(PullRequestPagerView.createIntent(context, repo, owner, issueNumber));
}
@Nullable private static TaskStackBuilder getIssueIntent(@NonNull Context context, @NonNull Uri uri) {
List<String> segments = uri.getPathSegments();
if (segments == null || segments.size() < 4) return null;
String owner;
String repo;
String number;
if ("issues".equals(segments.get(2))) {
owner = segments.get(0);
repo = segments.get(1);
number = segments.get(3);
} else if ("issues".equals(segments.get(3))) {//notifications url.
owner = segments.get(1);
repo = segments.get(2);
number = segments.get(4);
} else {
return null;
}
if (InputHelper.isEmpty(number))
return null;
int issueNumber;
try {
issueNumber = Integer.parseInt(number);
} catch (NumberFormatException nfe) {
return null;
}
if (issueNumber < 1) return null;
return TaskStackBuilder.create(context)
.addNextIntentWithParentStack(RepoPagerView.createIntent(context, repo, owner))
.addNextIntent(IssuePagerView.createIntent(context, repo, owner, issueNumber));
}
@Nullable private static TaskStackBuilder getRepo(@NonNull Context context, @NonNull Uri uri) {
List<String> segments = uri.getPathSegments();
if (segments == null || segments.size() < 2 || segments.size() > 2) return null;
String owner = segments.get(0);
String repoName = segments.get(1);
return TaskStackBuilder.create(context)
.addParentStack(MainView.class)
.addNextIntent(RepoPagerView.createIntent(context, repoName, owner));
}
/**
* [[k0shk0sh, FastHub, issues], k0shk0sh/fastHub/(issues,pulls,commits, etc)]
*/
@Nullable private static TaskStackBuilder getGeneralRepo(@NonNull Context context, @NonNull Uri uri) {
//TODO parse deeper links to their associate views. meantime fallback to repoPage
if (uri.getAuthority().equals(HOST_DEFAULT) || uri.getAuthority().equals(API_AUTHORITY)) {
List<String> segments = uri.getPathSegments();
if (segments == null || segments.isEmpty()) return null;
if (segments.size() == 1) {
return getUser(context, uri);
} else if (segments.size() > 1) {
String owner = segments.get(0);
String repoName = segments.get(1);
return TaskStackBuilder.create(context)
.addParentStack(MainView.class)
.addNextIntent(RepoPagerView.createIntent(context, repoName, owner));
}
}
return null;
}
@Nullable private static TaskStackBuilder getCommits(@NonNull Context context, @NonNull Uri uri) {
List<String> segments = uri.getPathSegments();
if (segments == null || segments.isEmpty() || segments.size() < 4) return null;
if (segments.get(3).equals("commits")) {
String login = segments.get(1);
String repoId = segments.get(2);
String sha = segments.get(4);
return TaskStackBuilder.create(context)
.addNextIntentWithParentStack(RepoPagerView.createIntent(context, repoId, login))
.addNextIntent(CommitPagerView.createIntent(context, repoId, login, sha));
}
return null;
}
@Nullable private static TaskStackBuilder getCommit(@NonNull Context context, @NonNull Uri uri) {
List<String> segments = uri.getPathSegments();
if (segments == null || segments.size() < 4 || !"commit".equals(segments.get(2))) return null;
String login = segments.get(0);
String repoId = segments.get(1);
String sha = segments.get(3);
return TaskStackBuilder.create(context)
.addNextIntentWithParentStack(RepoPagerView.createIntent(context, repoId, login))
.addNextIntent(CommitPagerView.createIntent(context, repoId, login, sha));
}
@Nullable private static TaskStackBuilder getUser(@NonNull Context context, @NonNull Uri uri) {
List<String> segments = uri.getPathSegments();
if (segments != null && !segments.isEmpty() && segments.size() == 1) {
return TaskStackBuilder.create(context)
.addParentStack(MainView.class)
.addNextIntent(UserPagerView.createIntent(context, segments.get(0)));
}
return null;
}
@Nullable private static TaskStackBuilder getBlob(@NonNull Context context, @NonNull Uri uri) {
List<String> segments = uri.getPathSegments();
if (segments == null || segments.size() < 4) return null;
String segmentTwo = segments.get(2);
if (segmentTwo.equals("blob") || segmentTwo.equals("tree")) {
String fullUrl = uri.toString();
if (uri.getAuthority().equalsIgnoreCase(HOST_DEFAULT)) {
fullUrl = "https://" + RAW_AUTHORITY + "/" + segments.get(0) + "/" + segments.get(1) + "/" +
segments.get(segments.size() - 2) + "/" + uri.getLastPathSegment();
}
if (fullUrl != null) {
return TaskStackBuilder.create(context)
.addParentStack(MainView.class)
.addNextIntent(CodeViewerView.createIntent(context, fullUrl));
}
} else {
String authority = uri.getAuthority();
if (TextUtils.equals(authority, RAW_AUTHORITY)) {
return TaskStackBuilder.create(context)
.addParentStack(MainView.class)
.addNextIntent(CodeViewerView.createIntent(context, uri.toString()));
}
}
return null;
}
@SafeVarargs private static <T> Optional<T> returnNonNull(T... t) {
return Stream.of(t).filter(value -> value != null).findFirst();
}
@Nullable private static String getGistId(@NonNull Uri uri) {
List<String> segments = uri.getPathSegments();
return segments != null && !segments.isEmpty() ? segments.get(0) : null;
}
}

8
app/src/main/java/com/fastaccess/provider/tasks/NotificationJobTask.java
View File

@ -7,6 +7,7 @@ import android.content.Context;
import android.content.Intent;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.TaskStackBuilder;
import android.support.v7.app.NotificationCompat;
import com.annimon.stream.Stream;
@ -16,6 +17,7 @@ import com.fastaccess.data.dao.NotificationThreadModel;
import com.fastaccess.helper.BundleConstant;
import com.fastaccess.helper.PrefGetter;
import com.fastaccess.provider.rest.RestProvider;
import com.fastaccess.ui.modules.main.MainView;
import com.fastaccess.ui.modules.notification.NotificationActivityView;
import com.firebase.jobdispatcher.Constraint;
import com.firebase.jobdispatcher.FirebaseJobDispatcher;
@ -87,10 +89,12 @@ public class NotificationJobTask extends JobService {
.count();
if (count > 0) {
Context context = getApplicationContext();
TaskStackBuilder taskStackBuilder = TaskStackBuilder.create(context);
taskStackBuilder.addParentStack(MainView.class);
Intent intent = new Intent(this, NotificationActivityView.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent,
PendingIntent.FLAG_UPDATE_CURRENT);
taskStackBuilder.addNextIntent(intent);
PendingIntent pendingIntent = taskStackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
Notification notification = new NotificationCompat.Builder(context)
.setSmallIcon(R.drawable.ic_announcement)
.setContentTitle(context.getString(R.string.notifictions))

4
app/src/main/java/com/fastaccess/ui/modules/parser/LinksParserActivity.java
View File

@ -8,7 +8,7 @@ import android.widget.Toast;
import com.fastaccess.R;
import com.fastaccess.data.dao.LoginModel;
import com.fastaccess.provider.scheme.SchemeParser;
import com.fastaccess.provider.scheme.StackBuilderSchemeParser;
import com.fastaccess.ui.modules.login.LoginView;
/**
@ -46,7 +46,7 @@ public class LinksParserActivity extends Activity {
}
private void onUriReceived() {
SchemeParser.launchUri(this, getIntent());
StackBuilderSchemeParser.launchUri(this, getIntent());
finish();
}
}

4
app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerView.java
View File

@ -242,10 +242,6 @@ public class IssuePagerView extends BaseActivity<IssuePagerMvp.View, IssuePagerP
getPresenter().onPutLabels(labels);
}
@Override public void onBackPressed() {
super.onBackPressed();
}
private void hideShowFab() {
if (getPresenter().isLocked() && !getPresenter().isOwner()) {
fab.hide();