diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ReposViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ReposViewHolder.java index a931f56d..c0f64986 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ReposViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ReposViewHolder.java @@ -31,6 +31,7 @@ public class ReposViewHolder extends BaseViewHolder { @BindView(R.id.forks) FontTextView forks; @BindView(R.id.avatarLayout) AvatarLayout avatarLayout; @BindString(R.string.forked) String forked; + @BindString(R.string.last_updated) String lastUpdated; private ReposViewHolder(@NonNull View itemView, @Nullable BaseRecyclerAdapter adapter) { super(itemView, adapter); @@ -55,7 +56,9 @@ public class ReposViewHolder extends BaseViewHolder { NumberFormat numberFormat = NumberFormat.getNumberInstance(); stars.setText(numberFormat.format(repo.getStargazersCount())); forks.setText(numberFormat.format(repo.getForks())); - date.setText(ParseDateFormat.getTimeAgo(repo.getUpdatedAt())); + date.setText(SpannableBuilder.builder().append(lastUpdated) + .append(" ") + .append(ParseDateFormat.getTimeAgo(repo.getUpdatedAt()))); } @Override public void bind(@NonNull RepoModel repo) {} diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerPresenter.java index 78497cb4..797660e4 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerPresenter.java @@ -4,6 +4,7 @@ import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.text.TextUtils; import com.annimon.stream.Collectors; import com.annimon.stream.Stream; @@ -95,11 +96,8 @@ class IssuePagerPresenter extends BasePresenter implements I @Override public boolean isRepoOwner() { if (getIssue() == null) return false; - UserModel userModel = getIssue() != null ? getIssue().getUser() : null; LoginModel me = LoginModel.getUser(); - PullsIssuesParser parser = PullsIssuesParser.getForPullRequest(getIssue().getHtmlUrl()); - return userModel != null && userModel.getLogin().equalsIgnoreCase(me.getLogin()) - || (parser != null && parser.getLogin().equalsIgnoreCase(me.getLogin())); + return TextUtils.equals(login, me.getLogin()); } @Override public boolean isLocked() { diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerPresenter.java index f990262f..403f485b 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerPresenter.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.text.TextUtils; import com.annimon.stream.Collectors; import com.annimon.stream.Stream; @@ -13,8 +14,6 @@ import com.fastaccess.data.dao.LabelModel; import com.fastaccess.data.dao.LoginModel; import com.fastaccess.data.dao.MergeRequestModel; import com.fastaccess.data.dao.PullRequestModel; -import com.fastaccess.data.dao.PullsIssuesParser; -import com.fastaccess.data.dao.UserModel; import com.fastaccess.data.service.IssueService; import com.fastaccess.helper.BundleConstant; import com.fastaccess.helper.InputHelper; @@ -97,11 +96,8 @@ class PullRequestPagerPresenter extends BasePresenter @Override public boolean isRepoOwner() { if (getPullRequest() == null) return false; - UserModel userModel = getPullRequest() != null ? getPullRequest().getUser() : null; LoginModel me = LoginModel.getUser(); - PullsIssuesParser parser = PullsIssuesParser.getForPullRequest(getPullRequest().getHtmlUrl()); - return userModel != null && userModel.getLogin().equalsIgnoreCase(me.getLogin()) - || (parser != null && parser.getLogin().equalsIgnoreCase(me.getLogin())); + return TextUtils.equals(login, me.getLogin()); } @Override public boolean isLocked() { diff --git a/app/src/main/res/drawable-nodpi/fasthub_splash.jpg b/app/src/main/res/drawable-nodpi/fasthub_splash.jpg deleted file mode 100644 index be5711d2..00000000 Binary files a/app/src/main/res/drawable-nodpi/fasthub_splash.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-nodpi/web_hi_res_512.png b/app/src/main/res/drawable-nodpi/web_hi_res_512.png new file mode 100755 index 00000000..3b9c858c Binary files /dev/null and b/app/src/main/res/drawable-nodpi/web_hi_res_512.png differ diff --git a/app/src/main/res/drawable/splash_screen_drawable.xml b/app/src/main/res/drawable/splash_screen_drawable.xml index bff4122e..4c6f02e3 100644 --- a/app/src/main/res/drawable/splash_screen_drawable.xml +++ b/app/src/main/res/drawable/splash_screen_drawable.xml @@ -1,12 +1,12 @@ - + + android:gravity="center" + android:src="@drawable/web_hi_res_512"/> \ No newline at end of file diff --git a/app/src/main/res/layouts/main_layouts/layout/activity_main_view.xml b/app/src/main/res/layouts/main_layouts/layout/activity_main_view.xml index 49d23aeb..4fc7beea 100644 --- a/app/src/main/res/layouts/main_layouts/layout/activity_main_view.xml +++ b/app/src/main/res/layouts/main_layouts/layout/activity_main_view.xml @@ -47,6 +47,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="start" + android:clickable="true" android:clipToPadding="false" android:fitsSystemWindows="true" android:paddingBottom="76dp" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cf69ff06..35aa017a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -173,4 +173,5 @@ Click here to watch/unwatch repo. Click here to fork repo. No url found. + Last Updated diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f67dcaae..030fa675 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -25,7 +25,6 @@