From 1d6cae0ee3a171cac5add9367c15af4b961d4d56 Mon Sep 17 00:00:00 2001 From: houxg Date: Mon, 19 Dec 2016 15:30:42 +0800 Subject: [PATCH] add github url --- .../org/houxg/leamonax/ui/AboutActivity.java | 5 +++++ .../org/houxg/leamonax/ui/SignInActivity.java | 10 ++-------- .../org/houxg/leamonax/utils/OpenUtils.java | 19 +++++++++++++++++++ app/src/main/res/layout/activity_about.xml | 15 +++++++++++++++ 4 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 app/src/main/java/org/houxg/leamonax/utils/OpenUtils.java diff --git a/app/src/main/java/org/houxg/leamonax/ui/AboutActivity.java b/app/src/main/java/org/houxg/leamonax/ui/AboutActivity.java index 1da66c4..6d6f44d 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/AboutActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/AboutActivity.java @@ -15,6 +15,7 @@ import org.houxg.leamonax.R; import org.houxg.leamonax.database.AppDataBase; import org.houxg.leamonax.model.Note; import org.houxg.leamonax.service.AccountService; +import org.houxg.leamonax.utils.OpenUtils; import org.houxg.leamonax.utils.TestUtils; import java.security.SecureRandom; @@ -77,5 +78,9 @@ public class AboutActivity extends BaseActivity { .subscribe(); } + @OnClick(R.id.ll_github) + void clickedGithub() { + OpenUtils.openUrl(this, "https://github.com/houxg/Leamonax"); + } } diff --git a/app/src/main/java/org/houxg/leamonax/ui/SignInActivity.java b/app/src/main/java/org/houxg/leamonax/ui/SignInActivity.java index 44b597b..230b967 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/SignInActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/SignInActivity.java @@ -2,7 +2,6 @@ package org.houxg.leamonax.ui; import android.content.Intent; -import android.net.Uri; import android.os.Bundle; import android.support.annotation.Nullable; import android.text.Editable; @@ -20,6 +19,7 @@ import org.houxg.leamonax.model.BaseResponse; import org.houxg.leamonax.network.ApiProvider; import org.houxg.leamonax.network.LeaFailure; import org.houxg.leamonax.service.AccountService; +import org.houxg.leamonax.utils.OpenUtils; import org.houxg.leamonax.utils.ToastUtils; import java.util.Locale; @@ -119,13 +119,7 @@ public class SignInActivity extends BaseActivity implements TextWatcher { @OnClick(R.id.tv_forgot_password) void clickedForgotPassword() { String url = getHost() + FIND_PASSWORD; - Intent i = new Intent(Intent.ACTION_VIEW); - i.setData(Uri.parse(url)); - try { - startActivity(i); - } catch (Exception ex) { - ToastUtils.show(this, R.string.host_address_is_incorrect); - } + OpenUtils.openUrl(this, url); } @OnClick(R.id.tv_custom_host) diff --git a/app/src/main/java/org/houxg/leamonax/utils/OpenUtils.java b/app/src/main/java/org/houxg/leamonax/utils/OpenUtils.java new file mode 100644 index 0000000..400a85a --- /dev/null +++ b/app/src/main/java/org/houxg/leamonax/utils/OpenUtils.java @@ -0,0 +1,19 @@ +package org.houxg.leamonax.utils; + + +import android.content.Context; +import android.content.Intent; +import android.net.Uri; + +public class OpenUtils { + + public static void openUrl(Context context, String url) { + Intent i = new Intent(Intent.ACTION_VIEW); + i.setData(Uri.parse(url)); + try { + context.startActivity(i); + } catch (Exception ex) { + ToastUtils.show(context, "Can't open this url"); + } + } +} diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index a2c4e3b..072c6cd 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -105,6 +105,21 @@ + + + + + + + +