diff --git a/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt b/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt index e0d34b2f1..77483ce33 100644 --- a/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt +++ b/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt @@ -12,11 +12,9 @@ import androidx.fragment.app.Fragment import com.github.libretube.R import com.github.libretube.activities.SettingsActivity import com.github.libretube.databinding.FragmentAboutBinding -import com.github.libretube.util.AUTHORS_URL -import com.github.libretube.util.CONTRIBUTING_URL import com.github.libretube.util.DONATE_URL +import com.github.libretube.util.GITHUB_URL import com.github.libretube.util.PIPED_GITHUB_URL -import com.github.libretube.util.ThemeHelper import com.github.libretube.util.WEBSITE_URL import com.google.android.material.dialog.MaterialAlertDialogBuilder @@ -41,9 +39,6 @@ class AboutFragment : Fragment() { binding.website.setOnClickListener { openLinkFromHref(WEBSITE_URL) } - binding.authors.setOnClickListener { - openLinkFromHref(AUTHORS_URL) - } binding.piped.setOnClickListener { openLinkFromHref(PIPED_GITHUB_URL) } @@ -51,7 +46,7 @@ class AboutFragment : Fragment() { openLinkFromHref(DONATE_URL) } binding.github.setOnClickListener { - openLinkFromHref(CONTRIBUTING_URL) + openLinkFromHref(GITHUB_URL) } binding.license.setOnClickListener { val licenseString = view.context.assets diff --git a/app/src/main/java/com/github/libretube/util/Constants.kt b/app/src/main/java/com/github/libretube/util/Constants.kt index 90a13a619..8b120a006 100644 --- a/app/src/main/java/com/github/libretube/util/Constants.kt +++ b/app/src/main/java/com/github/libretube/util/Constants.kt @@ -2,7 +2,6 @@ package com.github.libretube.util const val GITHUB_API_URL = "https://api.github.com/repos/libre-tube/LibreTube/releases/latest" const val WEBSITE_URL = "https://libre-tube.github.io/" -const val AUTHORS_URL = "https://github.com/libre-tube/LibreTube/graphs/contributors" -const val DONATE_URL = "https://libre-tube.github.io/#donate" -const val CONTRIBUTING_URL = "https://github.com/libre-tube/LibreTube#donate" +const val DONATE_URL = "https://github.com/libre-tube/LibreTube#donate" +const val GITHUB_URL = "https://github.com/libre-tube/LibreTube" const val PIPED_GITHUB_URL = "https://github.com/TeamPiped/Piped" diff --git a/app/src/main/res/drawable/ic_donate.xml b/app/src/main/res/drawable/ic_donate.xml new file mode 100644 index 000000000..d80715927 --- /dev/null +++ b/app/src/main/res/drawable/ic_donate.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml new file mode 100644 index 000000000..7476547b4 --- /dev/null +++ b/app/src/main/res/drawable/ic_github.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_piped.xml b/app/src/main/res/drawable/ic_piped.xml new file mode 100644 index 000000000..9eb312ea2 --- /dev/null +++ b/app/src/main/res/drawable/ic_piped.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index 9eef298de..d09cf88f7 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -1,8 +1,8 @@ + android:layout_height="match_parent"> + android:layout_marginTop="50dp" + android:src="@mipmap/ic_launcher_round" + app:shapeAppearanceOverlay="@style/CircleImageView" /> - + + + - - + style="@style/AboutTextView" + android:text="@string/website" /> - + + + - - - - - - - - - - - - - - + style="@style/AboutTextView" + android:text="@string/github" /> @@ -97,19 +67,15 @@ android:id="@+id/piped" style="@style/AboutCard"> - + + + - - + style="@style/AboutTextView" + android:text="@string/piped" /> @@ -119,19 +85,15 @@ android:id="@+id/donate" style="@style/AboutCard"> - + + + - - + style="@style/AboutTextView" + android:text="@string/donate" /> @@ -141,19 +103,15 @@ android:id="@+id/license" style="@style/AboutCard"> - + + + - - + style="@style/AboutTextView" + android:text="@string/license" /> diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml index 49c91f885..3db13793b 100644 --- a/app/src/main/res/values/style.xml +++ b/app/src/main/res/values/style.xml @@ -32,26 +32,47 @@ + + - + + diff --git a/app/src/main/res/xml/advanced_settings.xml b/app/src/main/res/xml/advanced_settings.xml index 19720126b..596003be4 100644 --- a/app/src/main/res/xml/advanced_settings.xml +++ b/app/src/main/res/xml/advanced_settings.xml @@ -58,8 +58,8 @@ android:defaultValue="true" android:icon="@drawable/ic_play_filled" app:key="watch_position_toggle" - app:title="@string/watch_positions" - app:summary="@string/watch_positions_summary"/> + app:summary="@string/watch_positions_summary" + app:title="@string/watch_positions" />