diff --git a/app/build.gradle b/app/build.gradle index 6d96213a..8aaca3d7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -90,7 +90,7 @@ dependencies { lombokVersion = '1.12.6' supportVerion = "25.2.0" firebase = "10.2.0" - thirtyinchVersion = '0.8.0-rc2' + thirtyinchVersion = '0.8.0-rc3' retrofit = '2.1.0' } compile fileTree(include: ['*.jar'], dir: 'libs') diff --git a/app/src/main/java/com/fastaccess/data/dao/PayloadModel.java b/app/src/main/java/com/fastaccess/data/dao/PayloadModel.java index b682758d..3613d375 100644 --- a/app/src/main/java/com/fastaccess/data/dao/PayloadModel.java +++ b/app/src/main/java/com/fastaccess/data/dao/PayloadModel.java @@ -5,6 +5,7 @@ import android.os.Parcelable; import com.siimkinks.sqlitemagic.annotation.Column; import com.siimkinks.sqlitemagic.annotation.Id; +import com.siimkinks.sqlitemagic.annotation.IgnoreColumn; import com.siimkinks.sqlitemagic.annotation.Table; import lombok.Getter; @@ -24,6 +25,7 @@ public class PayloadModel implements Parcelable { @Column String action; @Column(onDeleteCascade = true, handleRecursively = false) RepoModel forkee; @Column(onDeleteCascade = true, handleRecursively = false) IssueModel issue; + @IgnoreColumn private PullRequestModel pullRequest; @Override public int describeContents() { return 0; } diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssueDetailsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssueDetailsViewHolder.java index a8ba837f..e12347cf 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssueDetailsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssueDetailsViewHolder.java @@ -45,6 +45,8 @@ public class IssueDetailsViewHolder extends BaseViewHolder implements FeedsMvp.Pr } else { if (item.getPayload() != null && item.getPayload().getIssue() != null) { SchemeParser.launchUri(v.getContext(), Uri.parse(item.getPayload().getIssue().getHtmlUrl())); + } else if (item.getPayload() != null && item.getPayload().getPullRequest() != null) { + SchemeParser.launchUri(v.getContext(), Uri.parse(item.getPayload().getPullRequest().getHtmlUrl())); } else { RepoModel repoModel = item.getRepo(); String name = InputHelper.isEmpty(repoModel.getName()) ? repoModel.getFullName() : repoModel.getName(); diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerMvp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerMvp.java index e3574369..d074c1a5 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerMvp.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerMvp.java @@ -63,7 +63,6 @@ public interface RepoPagerMvp { } interface Presenter extends BaseMvp.FAPresenter, BottomNavigation.OnMenuItemSelectionListener { - void onActivityCreated(@Nullable Intent intent); @NonNull String repoId(); diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerPresenter.java index cf1e503e..3be94866 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerPresenter.java @@ -1,7 +1,5 @@ package com.fastaccess.ui.modules.repos; -import android.content.Intent; -import android.os.Bundle; import android.support.annotation.IdRes; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -12,7 +10,6 @@ import com.fastaccess.R; import com.fastaccess.data.dao.LoginModel; import com.fastaccess.data.dao.RepoModel; import com.fastaccess.helper.AppHelper; -import com.fastaccess.helper.BundleConstant; import com.fastaccess.helper.InputHelper; import com.fastaccess.helper.RxHelper; import com.fastaccess.provider.rest.RestProvider; @@ -38,18 +35,12 @@ class RepoPagerPresenter extends BasePresenter implements Rep private final String repoId; private RepoModel repo; - @Override public void onError(@NonNull Throwable throwable) { - onWorkOffline(); - super.onError(throwable); - } - - public RepoPagerPresenter(final String repoId, final String login) { + RepoPagerPresenter(final String repoId, final String login) { if (!InputHelper.isEmpty(login) && !InputHelper.isEmpty(repoId())) { - throw new IllegalArgumentException("aruments cannot be empty"); + throw new IllegalArgumentException("arguments cannot be empty"); } this.repoId = repoId; this.login = login; - makeRestCall(RestProvider.getRepoService().getRepo(login(), repoId()), repoModel -> { this.repo = repoModel; @@ -63,20 +54,18 @@ class RepoPagerPresenter extends BasePresenter implements Rep }); } - @Override - protected void onAttachView(@NonNull final RepoPagerMvp.View view) { - super.onAttachView(view); + @Override public void onError(@NonNull Throwable throwable) { + onWorkOffline(); + super.onError(throwable); + } + @Override protected void onAttachView(@NonNull final RepoPagerMvp.View view) { + super.onAttachView(view); if (getRepo() != null) { view.onInitRepo(); } } - @Override - public void onActivityCreated(@Nullable final Intent intent) { - // nothing to do - } - @NonNull @Override public String repoId() { return repoId; } diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerView.java index aa19ac1c..abbd5ca1 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerView.java @@ -137,17 +137,13 @@ public class RepoPagerView extends BaseActivity - + + android:fillViewport="true" + android:clipToPadding="false"> diff --git a/app/src/main/res/layouts/other_layouts/layout/enable_ads_swift.xml b/app/src/main/res/layouts/other_layouts/layout/enable_ads_switch.xml similarity index 100% rename from app/src/main/res/layouts/other_layouts/layout/enable_ads_swift.xml rename to app/src/main/res/layouts/other_layouts/layout/enable_ads_switch.xml