diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ea556b0b..9e25b314 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -34,6 +34,7 @@ + diff --git a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java index 9974ad53..2ccd58be 100644 --- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java @@ -194,16 +194,20 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList instanceHost = instanceUrl; } + String instanceUrlWithProtocol; if(protocol.toLowerCase().equals("https")) { instanceUrl = "https://" + instanceHost + "/api/v1/"; + instanceUrlWithProtocol = "https://" + instanceHost; } else { instanceUrl = "http://" + instanceHost + "/api/v1/"; + instanceUrlWithProtocol = "https://" + instanceHost; } tinyDb.putString("instanceUrlRaw", instanceHost); tinyDb.putString("loginUid", loginUid); tinyDb.putString("instanceUrl", instanceUrl); + tinyDb.putString("instanceUrlWithProtocol", instanceUrlWithProtocol); if(connToInternet) { diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java index 0a42adcd..c0003bc8 100644 --- a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java @@ -35,6 +35,7 @@ import org.mian.gitnex.models.UserRepositories; import org.mian.gitnex.util.AppUtil; import org.mian.gitnex.util.TinyDB; import java.util.Objects; +import android.net.Uri; /** * Author M M Arif @@ -153,6 +154,17 @@ public class RepoDetailActivity extends AppCompatActivity implements RepoBottomS case "createRelease": startActivity(new Intent(RepoDetailActivity.this, CreateReleaseActivity.class)); break; + case "openWebRepo": + TinyDB tinyDb = new TinyDB(getApplicationContext()); + String repoFullName = tinyDb.getString("repoFullName"); + String instanceUrlWithProtocol = "https://" + tinyDb.getString("instanceUrlRaw"); + if(!tinyDb.getString("instanceUrlWithProtocol").isEmpty()) { + instanceUrlWithProtocol = tinyDb.getString("instanceUrlWithProtocol"); + } + Uri url = Uri.parse(instanceUrlWithProtocol + "/" + repoFullName); + Intent i = new Intent(Intent.ACTION_VIEW, url); + startActivity(i); + break; } } diff --git a/app/src/main/java/org/mian/gitnex/fragments/RepoBottomSheetFragment.java b/app/src/main/java/org/mian/gitnex/fragments/RepoBottomSheetFragment.java index f1435fa9..efa9ab81 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/RepoBottomSheetFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/RepoBottomSheetFragment.java @@ -29,6 +29,7 @@ public class RepoBottomSheetFragment extends BottomSheetDialogFragment { TextView createMilestone = v.findViewById(R.id.createNewMilestone); TextView addCollaborator = v.findViewById(R.id.addCollaborator); TextView createRelease = v.findViewById(R.id.createRelease); + TextView openWebRepo = v.findViewById(R.id.openWebRepo); createLabel.setOnClickListener(new View.OnClickListener() { @Override @@ -70,6 +71,14 @@ public class RepoBottomSheetFragment extends BottomSheetDialogFragment { } }); + openWebRepo.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + bmListener.onButtonClicked("openWebRepo"); + dismiss(); + } + }); + return v; } 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 e91b1282..3d7539ee 100644 --- a/app/src/main/res/layout/repo_bottom_sheet_layout.xml +++ b/app/src/main/res/layout/repo_bottom_sheet_layout.xml @@ -67,4 +67,16 @@ android:textSize="16sp" android:padding="16dp" /> + + \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index dc5e6208..a6e5ce77 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -312,6 +312,7 @@ Möchtest du den Nutzer wirklich von dieser Repository entfernen? Benuter von der Repository entfernt. Benutzer zu der Repository hinzugefügt. + Öfne mit Browser diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index cd8801a0..5d5dbfa4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -416,6 +416,7 @@ Description Website Location + Ouvrir avec le Browser \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 7b046da8..4534a4f2 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -416,6 +416,7 @@ Описание Веб-сайт Место расположения + Открыть с помощью браузера \ 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 9489b4d3..7691dc75 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -342,6 +342,7 @@ Do you want to remove this user from the repository? User removed from the repository. User added to the repository. + Open with Browser