diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java index 6ed1bba1d..260878b00 100644 --- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java @@ -1,10 +1,14 @@ package fr.free.nrw.commons; +import android.content.Intent; +import android.net.Uri; import android.os.Bundle; +import android.view.View; import android.widget.TextView; import butterknife.BindView; import butterknife.ButterKnife; +import butterknife.OnClick; import fr.free.nrw.commons.theme.NavigationBaseActivity; import fr.free.nrw.commons.ui.widget.HtmlTextView; @@ -33,4 +37,32 @@ public class AboutActivity extends NavigationBaseActivity { versionText.setText(BuildConfig.VERSION_NAME); initDrawer(); } + + @OnClick(R.id.facebook_launch_icon) + public void launchFacebook(View view) { + + Intent intent; + try { + intent = new Intent(Intent.ACTION_VIEW, Uri.parse("fb://page/" + "1921335171459985")); + intent.setPackage("com.facebook.katana"); + startActivity(intent); + } catch (Exception e) { + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.facebook.com/" + "1921335171459985"))); + } + + } + + @OnClick(R.id.github_launch_icon) + public void launchGithub(View view) { + + Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/commons-app/apps-android-commons\\")); + startActivity(browserIntent); + } + + @OnClick(R.id.website_launch_icon) + public void launchWebsite(View view) { + + Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://commons-app.github.io/\\")); + startActivity(browserIntent); + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_action_facebook.xml b/app/src/main/res/drawable/ic_action_facebook.xml new file mode 100644 index 000000000..e17144640 --- /dev/null +++ b/app/src/main/res/drawable/ic_action_facebook.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_action_github.xml b/app/src/main/res/drawable/ic_action_github.xml new file mode 100644 index 000000000..569994ebf --- /dev/null +++ b/app/src/main/res/drawable/ic_action_github.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_action_website.xml b/app/src/main/res/drawable/ic_action_website.xml new file mode 100644 index 000000000..bad3beb94 --- /dev/null +++ b/app/src/main/res/drawable/ic_action_website.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index bbbced3e9..76c51a4aa 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -62,6 +62,48 @@ android:gravity="center" android:text="@string/about_improve" /> + + + + + + + + + + + + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 992c1924c..1e98a1e04 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -13,6 +13,7 @@ 4dp + 56dp 48dp 24dp 12dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3c9c67947..7fb975872 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -76,7 +76,7 @@ About The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. Wikimedia Commons - <a href=\"https://github.com/commons-app/apps-android-commons\">Source</a> and <a href=\"https://commons-app.github.io/\">website</a> on GitHub. Create a new <a href=\"https://github.com/commons-app/apps-android-commons/issues\">GitHub issue</a> for bug reports and suggestions. + Create a new <a href=\"https://github.com/commons-app/apps-android-commons/issues\">GitHub issue</a> for bug reports and suggestions. <a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\">Privacy policy</a> <a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\">Credits</a> About @@ -170,6 +170,9 @@ Two factor authentication is currently not supported. Do you really want to logout? Commons Logo + Commons Website + Commons Facebook Page + Commons Github Source Code Background Image Media Image Failed No Image Found diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index a9633f748..a7abfc17d 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -13,6 +13,7 @@ @color/button_background_dark @color/upload_overlay_background_dark @style/DarkSpinnerTheme + @color/main_background_light