From b4c0745b407ce38a4380b34b317f956d8119735f Mon Sep 17 00:00:00 2001 From: M M Arif Date: Mon, 16 Sep 2019 20:28:34 +0500 Subject: [PATCH] reduce large links in branches and releases to small text with links. Signed-off-by: M M Arif --- .../org/mian/gitnex/adapters/BranchesAdapter.java | 7 +++++-- .../org/mian/gitnex/adapters/ReleasesAdapter.java | 12 ++++++++++-- app/src/main/res/layout/branches_list.xml | 2 -- app/src/main/res/layout/releases_list.xml | 4 ---- app/src/main/res/values-de/strings.xml | 4 ++++ app/src/main/res/values-fr/strings.xml | 4 ++++ app/src/main/res/values-ru/strings.xml | 4 ++++ app/src/main/res/values/strings.xml | 4 ++++ 8 files changed, 31 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/adapters/BranchesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/BranchesAdapter.java index 2534aa65..d9b11557 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/BranchesAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/BranchesAdapter.java @@ -1,12 +1,13 @@ package org.mian.gitnex.adapters; import android.content.Context; +import android.text.Html; +import android.text.method.LinkMovementMethod; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; import org.mian.gitnex.R; -import org.mian.gitnex.helpers.UrlHelper; import org.mian.gitnex.models.Branches; import org.mian.gitnex.util.TinyDB; import java.util.List; @@ -66,7 +67,9 @@ public class BranchesAdapter extends RecyclerView.Adapter" + mCtx.getResources().getString(R.string.commitLinkBranchesTab) + " ")); + holder.branchCommitHash.setMovementMethod(LinkMovementMethod.getInstance()); } diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java index 51f9742c..e7d57a28 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java @@ -2,6 +2,8 @@ package org.mian.gitnex.adapters; import android.content.Context; import android.graphics.Color; +import android.text.Html; +import android.text.method.LinkMovementMethod; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -139,8 +141,14 @@ public class ReleasesAdapter extends RecyclerView.Adapter" + mCtx.getResources().getString(R.string.zipArchiveDownloadReleasesTab) + " ")); + holder.releaseZipDownload.setMovementMethod(LinkMovementMethod.getInstance()); + + holder.releaseTarDownload.setText( + Html.fromHtml("" + mCtx.getResources().getString(R.string.tarArchiveDownloadReleasesTab) + " ")); + holder.releaseTarDownload.setMovementMethod(LinkMovementMethod.getInstance()); } diff --git a/app/src/main/res/layout/branches_list.xml b/app/src/main/res/layout/branches_list.xml index df1db7f5..daa51cc0 100644 --- a/app/src/main/res/layout/branches_list.xml +++ b/app/src/main/res/layout/branches_list.xml @@ -36,10 +36,8 @@ android:layout_marginTop="10dp" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textIsSelectable="true" android:textColor="@color/colorWhite" android:textSize="16sp" - android:autoLink="web" android:textColorLink="@color/lightBlue"/> diff --git a/app/src/main/res/layout/releases_list.xml b/app/src/main/res/layout/releases_list.xml index 08e26bfd..9e89a99b 100644 --- a/app/src/main/res/layout/releases_list.xml +++ b/app/src/main/res/layout/releases_list.xml @@ -83,10 +83,8 @@ android:layout_height="wrap_content" android:layout_marginTop="5dp" android:text="@string/releaseZip" - android:textIsSelectable="true" android:textColor="@color/colorWhite" android:textSize="16sp" - android:autoLink="web" android:textColorLink="@color/lightBlue"/> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 4b3fa6cd..b66a6f24 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -404,6 +404,10 @@ Star Watcher + Commit + Zip Archive + Tar Archive + OK Fertig diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e46158b5..fcf0afb9 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -404,6 +404,10 @@ Star Watcher + Commit + Zip Archive + Tar Archive + OK Done diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 2e6e281f..892c9c92 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -404,6 +404,10 @@ Star Watcher + Commit + Zip Archive + Tar Archive + OK Готово diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 703a0bf4..c4d09afc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -441,6 +441,10 @@ Star Watcher + Commit + Zip Archive + Tar Archive + OK Done