From b15394e97dbaa5cec2f439e6ae6f358030d04c8b Mon Sep 17 00:00:00 2001 From: M M Arif Date: Sat, 14 Sep 2019 12:26:20 +0500 Subject: [PATCH 1/2] Add browser icon and xml element in menu --- app/src/main/res/drawable/ic_open_in_browser.xml | 5 +++++ app/src/main/res/layout/repo_bottom_sheet_layout.xml | 2 +- app/src/main/res/menu/repo_dotted_list_menu.xml | 5 +++++ app/src/main/res/values/strings.xml | 3 ++- 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/drawable/ic_open_in_browser.xml diff --git a/app/src/main/res/drawable/ic_open_in_browser.xml b/app/src/main/res/drawable/ic_open_in_browser.xml new file mode 100644 index 00000000..3fb9799c --- /dev/null +++ b/app/src/main/res/drawable/ic_open_in_browser.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/repo_bottom_sheet_layout.xml b/app/src/main/res/layout/repo_bottom_sheet_layout.xml index 3d7539ee..6b1db484 100644 --- a/app/src/main/res/layout/repo_bottom_sheet_layout.xml +++ b/app/src/main/res/layout/repo_bottom_sheet_layout.xml @@ -72,7 +72,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:drawableStart="@drawable/ic_language" + android:drawableStart="@drawable/ic_open_in_browser" android:drawablePadding="24dp" android:padding="16dp" android:text="@string/openWebRepo" diff --git a/app/src/main/res/menu/repo_dotted_list_menu.xml b/app/src/main/res/menu/repo_dotted_list_menu.xml index 6518de34..683d49c8 100644 --- a/app/src/main/res/menu/repo_dotted_list_menu.xml +++ b/app/src/main/res/menu/repo_dotted_list_menu.xml @@ -11,4 +11,9 @@ android:icon="@drawable/ic_watchers" android:title="@string/repoWatchersInMenu" /> + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0e3c9fef..703a0bf4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -342,7 +342,6 @@ Do you want to remove this user from the repository? User removed from the repository. User added to the repository. - Open with Browser @@ -433,6 +432,8 @@ OTP Code (Optional) Enter the otp code if 2FA is enabled + Open in Browser + Stargazers Watchers No stars found From 33d1373f6eac55c1fb3ad8d12d8b9b8e556a186f Mon Sep 17 00:00:00 2001 From: M M Arif Date: Sat, 14 Sep 2019 12:38:41 +0500 Subject: [PATCH 2/2] added open in browser --- app/src/main/AndroidManifest.xml | 1 + .../activities/OpenRepoInBrowserActivity.java | 35 +++++++++++++++++++ .../gitnex/adapters/MyReposListAdapter.java | 8 +++++ .../gitnex/adapters/ReposListAdapter.java | 8 +++++ .../adapters/RepositoriesByOrgAdapter.java | 8 +++++ .../adapters/StarredReposListAdapter.java | 8 +++++ .../main/res/menu/repo_dotted_list_menu.xml | 10 +++--- 7 files changed, 73 insertions(+), 5 deletions(-) create mode 100644 app/src/main/java/org/mian/gitnex/activities/OpenRepoInBrowserActivity.java diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3c50b0ad..3b2337c4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -59,6 +59,7 @@ android:launchMode="singleTask" /> + diff --git a/app/src/main/java/org/mian/gitnex/activities/OpenRepoInBrowserActivity.java b/app/src/main/java/org/mian/gitnex/activities/OpenRepoInBrowserActivity.java new file mode 100644 index 00000000..36379be7 --- /dev/null +++ b/app/src/main/java/org/mian/gitnex/activities/OpenRepoInBrowserActivity.java @@ -0,0 +1,35 @@ +package org.mian.gitnex.activities; + +import android.content.Intent; +import android.net.Uri; +import android.os.Bundle; +import androidx.appcompat.app.AppCompatActivity; +import org.mian.gitnex.util.TinyDB; + +/** + * Author M M Arif + */ + +public class OpenRepoInBrowserActivity extends AppCompatActivity { + + + @Override + protected void onCreate(Bundle savedInstanceState) { + + super.onCreate(savedInstanceState); + + TinyDB tinyDb = new TinyDB(getApplicationContext()); + String instanceUrlWithProtocol = "https://" + tinyDb.getString("instanceUrlRaw"); + if (!tinyDb.getString("instanceUrlWithProtocol").isEmpty()) { + instanceUrlWithProtocol = tinyDb.getString("instanceUrlWithProtocol"); + } + + String repoFullNameBrowser = getIntent().getStringExtra("repoFullNameBrowser"); + Uri url = Uri.parse(instanceUrlWithProtocol + "/" + repoFullNameBrowser); + Intent i = new Intent(Intent.ACTION_VIEW, url); + startActivity(i); + finish(); + + } + +} diff --git a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java index 737591fc..41e759d6 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java @@ -14,6 +14,7 @@ import android.widget.TextView; import com.amulyakhare.textdrawable.TextDrawable; import com.amulyakhare.textdrawable.util.ColorGenerator; import org.mian.gitnex.R; +import org.mian.gitnex.activities.OpenRepoInBrowserActivity; import org.mian.gitnex.activities.RepoDetailActivity; import org.mian.gitnex.activities.RepoStargazersActivity; import org.mian.gitnex.activities.RepoWatchersActivity; @@ -123,6 +124,13 @@ public class MyReposListAdapter extends RecyclerView.Adapter + + - - \ No newline at end of file