diff --git a/app/build.gradle b/app/build.gradle
index dde51c6c..1f3f51e5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,7 +22,7 @@ android {
storePassword((buildProperties.secrets['android_store_password'] | buildProperties.notThere['android_store_password']).string)
}
}
- compileSdkVersion 25
+ compileSdkVersion 26
buildToolsVersion "26.0.0"
defaultConfig {
applicationId "com.fastaccess.github"
diff --git a/app/src/main/java/com/fastaccess/provider/rest/loadmore/OnLoadMore.java b/app/src/main/java/com/fastaccess/provider/rest/loadmore/OnLoadMore.java
index 27a3c649..8e9de3bb 100644
--- a/app/src/main/java/com/fastaccess/provider/rest/loadmore/OnLoadMore.java
+++ b/app/src/main/java/com/fastaccess/provider/rest/loadmore/OnLoadMore.java
@@ -20,13 +20,6 @@ public class OnLoadMore extends InfiniteScroll {
this.parameter = parameter;
}
- @Override protected void onLoadMore(int page, int previousTotal) {
- super.onLoadMore(page, previousTotal);
- if (presenter != null) {
- presenter.setPreviousTotal(previousTotal);
- presenter.onCallApi(page + 1, parameter);
- }
- }
public void setParameter(@Nullable P parameter) {
this.parameter = parameter;
@@ -35,4 +28,11 @@ public class OnLoadMore
extends InfiniteScroll {
@Nullable public P getParameter() {
return parameter;
}
+
+ @Override public void onLoadMore(int page, int totalItemsCount) {
+ if (presenter != null) {
+ presenter.setPreviousTotal(totalItemsCount);
+ presenter.onCallApi(page + 1, parameter);
+ }
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PinnedReposViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PinnedReposViewHolder.java
index 6eb8f43f..489668bb 100644
--- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PinnedReposViewHolder.java
+++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PinnedReposViewHolder.java
@@ -11,11 +11,11 @@ import com.fastaccess.data.dao.model.PinnedRepos;
import com.fastaccess.data.dao.model.Repo;
import com.fastaccess.helper.InputHelper;
import com.fastaccess.helper.ParseDateFormat;
+import com.fastaccess.provider.colors.ColorsProvider;
import com.fastaccess.ui.widgets.AvatarLayout;
import com.fastaccess.ui.widgets.FontTextView;
import com.fastaccess.ui.widgets.LabelSpan;
import com.fastaccess.ui.widgets.SpannableBuilder;
-import com.fastaccess.ui.widgets.color.ColorGenerator;
import com.fastaccess.ui.widgets.recyclerview.BaseRecyclerAdapter;
import com.fastaccess.ui.widgets.recyclerview.BaseViewHolder;
@@ -79,7 +79,7 @@ public class PinnedReposViewHolder extends BaseViewHolder {
date.setText(ParseDateFormat.getTimeAgo(repo.getUpdatedAt()));
if (!InputHelper.isEmpty(repo.getLanguage())) {
language.setText(repo.getLanguage());
- language.setTextColor(ColorGenerator.getColor(itemView.getContext(), repo.getLanguage()));
+ language.setTextColor(ColorsProvider.getColorAsColor(repo.getLanguage(), language.getContext()));
language.setVisibility(View.VISIBLE);
}
}
diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/events/ProfileEventsFragment.kt b/app/src/main/java/com/fastaccess/ui/modules/profile/events/ProfileEventsFragment.kt
index 885f3cdb..ca43c937 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/profile/events/ProfileEventsFragment.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/profile/events/ProfileEventsFragment.kt
@@ -29,9 +29,9 @@ import java.util.*
open class ProfileEventsFragment : BaseFragment(), ProfileEventsMvp.View {
- val recycler: DynamicRecyclerView by lazy { view!!.findViewById(R.id.recycler) as DynamicRecyclerView }
- val refresh: SwipeRefreshLayout by lazy { view!!.findViewById(R.id.refresh) as SwipeRefreshLayout }
- val stateLayout: StateLayout by lazy { view!!.findViewById(R.id.stateLayout) as StateLayout }
+ val recycler: DynamicRecyclerView by lazy { view!!.findViewById(R.id.recycler) }
+ val refresh: SwipeRefreshLayout by lazy { view!!.findViewById(R.id.refresh) }
+ val stateLayout: StateLayout by lazy { view!!.findViewById(R.id.stateLayout) }
val adapter by lazy { FeedsAdapter(presenter.getEvents(), true) }
private var onLoadMore: OnLoadMore? = null
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerActivity.java b/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerActivity.java
index 9764c406..b0a31b69 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerActivity.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerActivity.java
@@ -189,7 +189,7 @@ public class RepoPagerActivity extends BaseActivity FileHelper.ONE_MB && !MarkDownProvider.isImage(url)) {
- MessageDialogView.newInstance(getString(R.string.big_file), getString(R.string.big_file_description), false, true,
- Bundler.start().put(BundleConstant.EXTRA, model.getDownloadUrl())
+ MessageDialogView.newInstance(getString(R.string.big_file), getString(R.string.big_file_description),
+ false, true, Bundler.start()
+ .put(BundleConstant.EXTRA, model.getDownloadUrl())
.put(BundleConstant.YES_NO_EXTRA, true)
.end())
.show(getChildFragmentManager(), "MessageDialogView");
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/code/prettifier/ViewerFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/code/prettifier/ViewerFragment.java
index ed71ce73..56a6ed32 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/code/prettifier/ViewerFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/code/prettifier/ViewerFragment.java
@@ -153,7 +153,7 @@ public class ViewerFragment extends BaseFragment getPresenter().onHandleIntent(getArguments()));
if (getPresenter().isRepo()) {
- appBarLayout = (AppBarLayout) getActivity().findViewById(R.id.appbar);
- bottomNavigation = (BottomNavigation) getActivity().findViewById(R.id.bottomNavigation);
+ appBarLayout = getActivity().findViewById(R.id.appbar);
+ bottomNavigation = getActivity().findViewById(R.id.bottomNavigation);
}
}
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerActivity.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerActivity.java
index bfc08d81..44234394 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerActivity.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerActivity.java
@@ -87,7 +87,8 @@ public class IssuePagerActivity extends BaseActivity>() {
- val toolbar: Toolbar by lazy { view!!.findViewById(R.id.toolbar) as Toolbar }
- val textView: TextView by lazy { view!!.findViewById(R.id.text) as TextView }
- val lineNo: TextView by lazy { view!!.findViewById(R.id.lineNo) as TextView }
- val editText: TextInputLayout by lazy { view!!.findViewById(R.id.editText) as TextInputLayout }
+ val toolbar: Toolbar by lazy { view!!.findViewById(R.id.toolbar) }
+ val textView: TextView by lazy { view!!.findViewById(R.id.text) }
+ val lineNo: TextView by lazy { view!!.findViewById(R.id.lineNo) }
+ val editText: TextInputLayout by lazy { view!!.findViewById(R.id.editText) }
val spacePattern = "\\s+".toRegex()
diff --git a/app/src/main/java/com/fastaccess/ui/modules/reviews/changes/ReviewChangesActivity.kt b/app/src/main/java/com/fastaccess/ui/modules/reviews/changes/ReviewChangesActivity.kt
index f39108ff..76c729e0 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/reviews/changes/ReviewChangesActivity.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/reviews/changes/ReviewChangesActivity.kt
@@ -16,6 +16,7 @@ import com.fastaccess.data.dao.ReviewRequestModel
import com.fastaccess.helper.*
import com.fastaccess.provider.theme.ThemeEngine
import com.fastaccess.ui.base.BaseActivity
+import com.fastaccess.ui.widgets.bindView
import com.fastaccess.ui.widgets.dialog.ProgressDialogFragment
/**
@@ -24,9 +25,9 @@ import com.fastaccess.ui.widgets.dialog.ProgressDialogFragment
class ReviewChangesActivity : BaseActivity(), ReviewChangesMvp.View {
- val toolbar: Toolbar by lazy { findViewById(R.id.toolbar) as Toolbar }
- val spinner: Spinner by lazy { findViewById(R.id.reviewMethod) as Spinner }
- val editText: TextInputLayout by lazy { findViewById(R.id.editText) as TextInputLayout }
+ val toolbar: Toolbar by bindView(R.id.toolbar)
+ val spinner: Spinner by bindView(R.id.reviewMethod)
+ val editText: TextInputLayout by bindView(R.id.editText)
@State var reviewRequest: ReviewRequestModel? = null
@State var repoId: String? = null
diff --git a/app/src/main/java/com/fastaccess/ui/modules/search/code/SearchCodeFragment.java b/app/src/main/java/com/fastaccess/ui/modules/search/code/SearchCodeFragment.java
index 0d3492f9..fd9b75a6 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/search/code/SearchCodeFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/search/code/SearchCodeFragment.java
@@ -124,7 +124,6 @@ public class SearchCodeFragment extends BaseFragment(), ThemeFragmentMvp.View {
- val apply: FloatingActionButton by lazy { view!!.findViewById(R.id.apply) as FloatingActionButton }
- val toolbar: Toolbar by lazy { view!!.findViewById(R.id.toolbar) as Toolbar }
+ val apply: FloatingActionButton by lazy { view!!.findViewById(R.id.apply) }
+ val toolbar: Toolbar by lazy { view!!.findViewById(R.id.toolbar) }
private val THEME = "appTheme"
private var primaryDarkColor: Int = 0
diff --git a/app/src/main/java/com/fastaccess/ui/modules/trending/fragment/TrendingFragment.kt b/app/src/main/java/com/fastaccess/ui/modules/trending/fragment/TrendingFragment.kt
index af7dbd9e..53569584 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/trending/fragment/TrendingFragment.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/trending/fragment/TrendingFragment.kt
@@ -17,9 +17,9 @@ import com.fastaccess.ui.widgets.recyclerview.DynamicRecyclerView
class TrendingFragment : BaseFragment(), TrendingFragmentMvp.View {
- val recycler: DynamicRecyclerView by lazy { view!!.findViewById(R.id.recycler) as DynamicRecyclerView }
- val refresh: SwipeRefreshLayout by lazy { view!!.findViewById(R.id.refresh) as SwipeRefreshLayout }
- val stateLayout: StateLayout by lazy { view!!.findViewById(R.id.stateLayout) as StateLayout }
+ val recycler: DynamicRecyclerView by lazy { view!!.findViewById(R.id.recycler) }
+ val refresh: SwipeRefreshLayout by lazy { view!!.findViewById(R.id.refresh) }
+ val stateLayout: StateLayout by lazy { view!!.findViewById(R.id.stateLayout) }
val adapter by lazy { TrendingAdapter(presenter.getTendingList()) }
@State var lang: String = ""
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/scroll/InfiniteScroll.java b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/scroll/InfiniteScroll.java
index 1a69fb59..f6c2b71a 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/scroll/InfiniteScroll.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/scroll/InfiniteScroll.java
@@ -1,85 +1,93 @@
package com.fastaccess.ui.widgets.recyclerview.scroll;
-import android.support.annotation.NonNull;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.StaggeredGridLayoutManager;
/**
* Created by Kosh on 8/2/2015. copyrights are reserved @
*/
-@SuppressWarnings("FieldCanBeLocal") public abstract class InfiniteScroll extends RecyclerView.OnScrollListener {
- private int previousTotal = 0;
+public abstract class InfiniteScroll extends RecyclerView.OnScrollListener {
+ private int visibleThreshold = 3;
+ private int currentPage = 0;
+ private int previousTotalItemCount = 0;
private boolean loading = true;
- private int visibleThreshold = 2;
- private int firstVisibleItem;
- private int visibleItemCount;
- private int totalItemCount;
- private int current_page = 0;
- private RecyclerViewPositionHelper mRecyclerViewHelper;
- private static final int HIDE_THRESHOLD = 20;
- private int scrolledDistance = 0;
- private boolean controlsVisible = true;
+ private int startingPageIndex = 0;
+ private RecyclerView.LayoutManager mLayoutManager;
public InfiniteScroll() {}
- @Override public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
- super.onScrollStateChanged(recyclerView, newState);
- mRecyclerViewHelper = RecyclerViewPositionHelper.createHelper(recyclerView);
- visibleItemCount = recyclerView.getChildCount();
- totalItemCount = mRecyclerViewHelper.getItemCount();
- firstVisibleItem = mRecyclerViewHelper.findFirstVisibleItemPosition();
- if (loading) {
- if (totalItemCount > previousTotal) {
- loading = false;
- previousTotal = totalItemCount;
+ public InfiniteScroll(RecyclerView.LayoutManager layoutManager) {
+ initLayoutManager(layoutManager);
+ }
+
+ private void initLayoutManager(RecyclerView.LayoutManager layoutManager) {
+ this.mLayoutManager = layoutManager;
+ if (layoutManager instanceof GridLayoutManager) {
+ visibleThreshold = visibleThreshold * ((GridLayoutManager) layoutManager).getSpanCount();
+ } else if (layoutManager instanceof StaggeredGridLayoutManager) {
+ visibleThreshold = visibleThreshold * ((StaggeredGridLayoutManager) layoutManager).getSpanCount();
+ }
+ }
+
+ private int getLastVisibleItem(int[] lastVisibleItemPositions) {
+ int maxSize = 0;
+ for (int i = 0; i < lastVisibleItemPositions.length; i++) {
+ if (i == 0) {
+ maxSize = lastVisibleItemPositions[i];
+ } else if (lastVisibleItemPositions[i] > maxSize) {
+ maxSize = lastVisibleItemPositions[i];
}
}
- if (!loading && (totalItemCount - visibleItemCount) <= (firstVisibleItem + visibleThreshold)) {
- current_page++;
- onLoadMore(current_page, previousTotal);
- loading = true;
- }
- if (firstVisibleItem + visibleItemCount >= totalItemCount) {
- onScrollToLast(recyclerView);
- }
+ return maxSize;
}
@Override public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
- super.onScrolled(recyclerView, dx, dy);
- if (scrolledDistance > HIDE_THRESHOLD && controlsVisible) {
- onHide(recyclerView);
- controlsVisible = false;
- scrolledDistance = 0;
- } else if (scrolledDistance < -HIDE_THRESHOLD && !controlsVisible) {
- onShow(recyclerView);
- controlsVisible = true;
- scrolledDistance = 0;
+ if (mLayoutManager == null) {
+ initLayoutManager(recyclerView.getLayoutManager());
}
- if ((controlsVisible && dy > 0) || (!controlsVisible && dy < 0)) {
- scrolledDistance += dy;
+ int lastVisibleItemPosition = 0;
+ int totalItemCount = mLayoutManager.getItemCount();
+ if (mLayoutManager instanceof StaggeredGridLayoutManager) {
+ int[] lastVisibleItemPositions = ((StaggeredGridLayoutManager) mLayoutManager).findLastVisibleItemPositions(null);
+ lastVisibleItemPosition = getLastVisibleItem(lastVisibleItemPositions);
+ } else if (mLayoutManager instanceof GridLayoutManager) {
+ lastVisibleItemPosition = ((GridLayoutManager) mLayoutManager).findLastVisibleItemPosition();
+ } else if (mLayoutManager instanceof LinearLayoutManager) {
+ lastVisibleItemPosition = ((LinearLayoutManager) mLayoutManager).findLastVisibleItemPosition();
+ }
+ if (totalItemCount < previousTotalItemCount) {
+ this.currentPage = this.startingPageIndex;
+ this.previousTotalItemCount = totalItemCount;
+ if (totalItemCount == 0) {
+ this.loading = true;
+ }
+ }
+ if (loading && (totalItemCount > previousTotalItemCount)) {
+ loading = false;
+ previousTotalItemCount = totalItemCount;
+ }
+ if (!loading && (lastVisibleItemPosition + visibleThreshold) > totalItemCount) {
+ currentPage++;
+ onLoadMore(currentPage, totalItemCount);
+ loading = true;
}
}
- @SuppressWarnings("WeakerAccess") protected void onScrollToLast(RecyclerView recyclerView) {}
-
- @SuppressWarnings("WeakerAccess") protected void onShow(RecyclerView recyclerView) {}
-
- @SuppressWarnings("WeakerAccess") protected void onHide(RecyclerView recyclerView) {
-
- }
-
- protected void onLoadMore(int page, int previousTotal) {}
-
public void reset() {
- this.previousTotal = 0;
+ this.currentPage = this.startingPageIndex;
+ this.previousTotalItemCount = 0;
this.loading = true;
- this.current_page = 0;
}
public void setCurrent_page(int page, int previousTotal) {
- this.current_page = page;
- this.previousTotal = previousTotal;
+ this.currentPage = page;
+ this.previousTotalItemCount = previousTotal;
this.loading = true;
-
}
+
+ public abstract void onLoadMore(int page, int totalItemsCount);
+
}
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/scroll/RecyclerViewPositionHelper.java b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/scroll/RecyclerViewPositionHelper.java
deleted file mode 100644
index 8fe7f624..00000000
--- a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/scroll/RecyclerViewPositionHelper.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.fastaccess.ui.widgets.recyclerview.scroll;
-
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.OrientationHelper;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-
-/**
- * Created by Kosh on 8/2/2015. copyrights are reserved @
- */
-class RecyclerViewPositionHelper {
- @NonNull private final RecyclerView recyclerView;
- private final RecyclerView.LayoutManager layoutManager;
-
- private RecyclerViewPositionHelper(@NonNull RecyclerView recyclerView) {
- this.recyclerView = recyclerView;
- this.layoutManager = recyclerView.getLayoutManager();
- }
-
- static RecyclerViewPositionHelper createHelper(@Nullable RecyclerView recyclerView) {
- if (recyclerView == null) {
- throw new NullPointerException("Recycler View is null");
- }
- return new RecyclerViewPositionHelper(recyclerView);
- }
-
- int getItemCount() {
- return layoutManager == null ? 0 : layoutManager.getItemCount();
- }
-
- int findFirstVisibleItemPosition() {
- final View child = findOneVisibleChild(0, layoutManager.getChildCount(), false, true);
- return child == null ? RecyclerView.NO_POSITION : recyclerView.getChildAdapterPosition(child);
- }
-
- public int findFirstCompletelyVisibleItemPosition() {
- final View child = findOneVisibleChild(0, layoutManager.getChildCount(), true, false);
- return child == null ? RecyclerView.NO_POSITION : recyclerView.getChildAdapterPosition(child);
- }
-
- public int findLastVisibleItemPosition() {
- final View child = findOneVisibleChild(layoutManager.getChildCount() - 1, -1, false, true);
- return child == null ? RecyclerView.NO_POSITION : recyclerView.getChildAdapterPosition(child);
- }
-
- public int findLastCompletelyVisibleItemPosition() {
- final View child = findOneVisibleChild(layoutManager.getChildCount() - 1, -1, true, false);
- return child == null ? RecyclerView.NO_POSITION : recyclerView.getChildAdapterPosition(child);
- }
-
- @Nullable private View findOneVisibleChild(int fromIndex, int toIndex, boolean completelyVisible, boolean acceptPartiallyVisible) {
- OrientationHelper helper;
- if (layoutManager.canScrollVertically()) {
- helper = OrientationHelper.createVerticalHelper(layoutManager);
- } else {
- helper = OrientationHelper.createHorizontalHelper(layoutManager);
- }
-
- final int start = helper.getStartAfterPadding();
- final int end = helper.getEndAfterPadding();
- final int next = toIndex > fromIndex ? 1 : -1;
- View partiallyVisible = null;
- for (int i = fromIndex; i != toIndex; i += next) {
- final View child = layoutManager.getChildAt(i);
- final int childStart = helper.getDecoratedStart(child);
- final int childEnd = helper.getDecoratedEnd(child);
- if (childStart < end && childEnd > start) {
- if (completelyVisible) {
- if (childStart >= start && childEnd <= end) {
- return child;
- } else if (acceptPartiallyVisible && partiallyVisible == null) {
- partiallyVisible = child;
- }
- } else {
- return child;
- }
- }
- }
- return partiallyVisible;
- }
-}
diff --git a/app/src/main/res/layouts/main_layouts/layout/issue_popup_layout.xml b/app/src/main/res/layouts/main_layouts/layout/issue_popup_layout.xml
index 0820cb68..8f6fd43c 100644
--- a/app/src/main/res/layouts/main_layouts/layout/issue_popup_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/issue_popup_layout.xml
@@ -71,13 +71,17 @@
style="@style/TextAppearance.AppCompat.Medium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/spacing_micro"
+ android:background="@drawable/bottom_border"
+ android:paddingBottom="@dimen/spacing_normal"
tools:text="Hello world"/>
diff --git a/app/src/main/res/layouts/main_layouts/layout/title_header_layout.xml b/app/src/main/res/layouts/main_layouts/layout/title_header_layout.xml
index 7e070f4c..b4f4a7d5 100644
--- a/app/src/main/res/layouts/main_layouts/layout/title_header_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/title_header_layout.xml
@@ -67,7 +67,7 @@
diff --git a/app/src/main/res/layouts/row_layouts/layout/feeds_row_no_image_item.xml b/app/src/main/res/layouts/row_layouts/layout/feeds_row_no_image_item.xml
index 3c0234d0..1d7194e4 100644
--- a/app/src/main/res/layouts/row_layouts/layout/feeds_row_no_image_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/feeds_row_no_image_item.xml
@@ -41,10 +41,11 @@
diff --git a/app/src/main/res/layouts/row_layouts/layout/issue_no_image_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/issue_no_image_row_item.xml
index 0c61bb75..d2b3b62a 100644
--- a/app/src/main/res/layouts/row_layouts/layout/issue_no_image_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/issue_no_image_row_item.xml
@@ -50,7 +50,7 @@
diff --git a/app/src/main/res/layouts/row_layouts/layout/profile_org_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/profile_org_row_item.xml
index 52a90965..5ce01996 100644
--- a/app/src/main/res/layouts/row_layouts/layout/profile_org_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/profile_org_row_item.xml
@@ -15,7 +15,7 @@
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d17d994a..24972b6f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -177,7 +177,7 @@
Code viewer
Open in browser
Large file
- The file is too big to open.\nPress "OK" to download it instead.
+ The file is too big to open.\nPress "Yes" to download it instead.
Viewer
Submit
Type here
diff --git a/build.gradle b/build.gradle
index fdd4bbe9..c1b6c175 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
butterKnifeVersion = '8.5.1'
state_version = '1.1.0'
lombokVersion = '1.12.6'
- supportVersion = "25.4.0"
+ supportVersion = "26.0.0-beta2"
gms = "11.0.1"
thirtyinchVersion = '0.8.0'
retrofit = '2.3.0'