Merge pull request #4205 from Bnyro/master

chore: Add lemmy community to help activity, remove telegram
This commit is contained in:
Bnyro 2023-07-11 11:09:34 +02:00 committed by GitHub
commit 47aaeda64b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 49 additions and 17 deletions

View File

@ -16,11 +16,11 @@ const val LICENSE_URL = "https://gnu.org/"
const val FAQ_URL = "https://libre-tube.github.io/#faq" const val FAQ_URL = "https://libre-tube.github.io/#faq"
/** /**
* Social media links for the community fragment * Social media links for the help activity
*/ */
const val MATRIX_URL = "https://matrix.to/#/#LibreTube:matrix.org" const val MATRIX_URL = "https://matrix.to/#/#LibreTube:matrix.org"
const val MASTODON_URL = "https://fosstodon.org/@libretube" const val MASTODON_URL = "https://fosstodon.org/@libretube"
const val TELEGRAM_URL = "https://t.me/libretube" const val LEMMY_URL = "https://feddit.rocks/c/libretube"
/** /**
* Share Dialog * Share Dialog

View File

@ -2,9 +2,9 @@ package com.github.libretube.ui.activities
import android.os.Bundle import android.os.Bundle
import com.github.libretube.constants.FAQ_URL import com.github.libretube.constants.FAQ_URL
import com.github.libretube.constants.LEMMY_URL
import com.github.libretube.constants.MASTODON_URL import com.github.libretube.constants.MASTODON_URL
import com.github.libretube.constants.MATRIX_URL import com.github.libretube.constants.MATRIX_URL
import com.github.libretube.constants.TELEGRAM_URL
import com.github.libretube.databinding.ActivityHelpBinding import com.github.libretube.databinding.ActivityHelpBinding
import com.github.libretube.helpers.IntentHelper import com.github.libretube.helpers.IntentHelper
import com.github.libretube.ui.base.BaseActivity import com.github.libretube.ui.base.BaseActivity
@ -26,7 +26,7 @@ class HelpActivity : BaseActivity() {
setupCard(binding.faq, FAQ_URL) setupCard(binding.faq, FAQ_URL)
setupCard(binding.matrix, MATRIX_URL) setupCard(binding.matrix, MATRIX_URL)
setupCard(binding.mastodon, MASTODON_URL) setupCard(binding.mastodon, MASTODON_URL)
setupCard(binding.telegram, TELEGRAM_URL) setupCard(binding.lemmy, LEMMY_URL)
} }
private fun setupCard(card: MaterialCardView, link: String) { private fun setupCard(card: MaterialCardView, link: String) {

View File

@ -0,0 +1,42 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?colorControlNormal"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:fillColor="#00000000"
android:pathData="m716.9,336.9c15.3,-21.4 35.4,-41.1 56.5,-53.3 66.7,-38.5 137,-33.2 170.1,22.4 33.1,55.7 15,117.5 -47.6,159.9 -32,19.3 -62.9,30.9 -97.2,35.5M307.1,336.9C291.9,315.5 271.8,295.8 250.6,283.6 184,245.1 113.6,250.4 80.6,306 47.5,361.7 65.6,423.5 128.2,465.9c32,19.3 62.9,30.9 97.2,35.5"
android:strokeWidth="28"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:fillColor="#00000000"
android:pathData="M801.2,550.8C812.7,401 720.6,295.9 512,299.3 303.4,302.7 213.7,402 222.8,550.8c8.6,142.1 176.8,246.4 288.1,246.4 111.3,0 279.5,-104.5 290.3,-246.4z"
android:strokeWidth="28"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:fillColor="#000000"
android:pathData="m610.5,618.2c0,23.1 18.7,41.8 41.8,41.8 23.1,0 41.8,-18.7 41.8,-41.8 0,-23.1 -18.7,-41.8 -41.8,-41.8 -23.1,0 -41.8,18.7 -41.8,41.8zM329.9,618.2c0,23.3 18.9,42.2 42.2,42.2 23.3,0 42.2,-18.9 42.2,-42.2 0,-23.3 -18.9,-42.2 -42.2,-42.2 -23.3,0 -42.2,18.9 -42.2,42.2z"
android:strokeWidth="0"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:fillColor="#00000000"
android:pathData="m339.7,743.2 l-54.5,72.2m399.1,-72.2 l54.5,72.2M263.7,671.8 L175.9,707.6m579.9,-35.8 l87.8,35.8"
android:strokeWidth="32"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="miter" />
<path
android:fillColor="#00000000"
android:pathData="m512,687c-45.9,0 -75.1,31.8 -74.1,71.1 1.1,42.5 32.5,71.1 74.1,71.1 41.7,0 74.1,-33 74.1,-71.1 0.1,-39.3 -28.3,-71.1 -74.1,-71.1z"
android:strokeWidth="28"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</vector>

View File

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="15"
android:viewportHeight="15">
<path
android:fillColor="#000000"
android:pathData="M14.993,1.582C15.022,1.407 14.957,1.23 14.821,1.116C14.685,1.003 14.499,0.97 14.332,1.029L0.332,6.029C0.143,6.096 0.013,6.27 0.001,6.47C-0.011,6.67 0.097,6.858 0.276,6.947L4.276,8.947C4.437,9.027 4.628,9.016 4.777,8.916L8.098,6.702L6.11,9.188C6.022,9.297 5.984,9.438 6.006,9.577C6.027,9.715 6.106,9.838 6.223,9.916L12.223,13.916C12.364,14.01 12.543,14.026 12.699,13.959C12.854,13.891 12.965,13.75 12.993,13.582L14.993,1.582Z" />
</vector>

View File

@ -64,13 +64,13 @@
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:id="@+id/telegram" android:id="@+id/lemmy"
style="@style/AboutCard"> style="@style/AboutCard">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
style="@style/AboutItem" style="@style/AboutItem"
android:text="Telegram" android:text="Lemmy"
app:drawableStartCompat="@drawable/ic_telegram" app:drawableStartCompat="@drawable/ic_lemmy"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>