Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/build_about.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ on:
paths:
- about/**

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
build:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build_filepicker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ on:
paths:
- filepicker/**

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
build:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build_folderstree.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ on:
paths:
- folderstree/**

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
build:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build_sample.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ on:
paths:
- sample/**

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
build:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build_scorewidget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ on:
paths:
- scorewidget/**

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
build:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build_tagselector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ on:
paths:
- tagselector/**

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
build:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/build_utils.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ on:
paths:
- utils/**

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}


jobs:
build:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/release_about.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
tags:
- 'about*'

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
release:
runs-on: ubuntu-latest
Expand All @@ -23,6 +26,4 @@ jobs:
- name: Publish about to Github
uses: gradle/gradle-build-action@v2
with:
arguments: about:publish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
arguments: about:publish
7 changes: 4 additions & 3 deletions .github/workflows/release_filepicker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
tags:
- 'filepicker*'

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
release:
runs-on: ubuntu-latest
Expand All @@ -23,6 +26,4 @@ jobs:
- name: Publish filepicker to Github
uses: gradle/gradle-build-action@v2
with:
arguments: filepicker:publish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
arguments: filepicker:publish
7 changes: 4 additions & 3 deletions .github/workflows/release_folderstree.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
tags:
- 'folderstree*'

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
release:
runs-on: ubuntu-latest
Expand All @@ -23,6 +26,4 @@ jobs:
- name: Publish components to Github
uses: gradle/gradle-build-action@v2
with:
arguments: folderstree:publish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
arguments: folderstree:publish
7 changes: 4 additions & 3 deletions .github/workflows/release_scorewidget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
tags:
- 'scorewidget*'

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
release:
runs-on: ubuntu-latest
Expand All @@ -23,6 +26,4 @@ jobs:
- name: Publish components to Github
uses: gradle/gradle-build-action@v2
with:
arguments: scorewidget:publish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
arguments: scorewidget:publish
5 changes: 3 additions & 2 deletions .github/workflows/release_tagselector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
tags:
- 'tagselector*'

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
release:
runs-on: ubuntu-latest
Expand All @@ -24,5 +27,3 @@ jobs:
uses: gradle/gradle-build-action@v2
with:
arguments: tagselector:publish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7 changes: 4 additions & 3 deletions .github/workflows/release_utils.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
tags:
- 'utils*'

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
release:
runs-on: ubuntu-latest
Expand All @@ -23,6 +26,4 @@ jobs:
- name: Publish components to Github
uses: gradle/gradle-build-action@v2
with:
arguments: utils:publish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
arguments: utils:publish
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
@file:OptIn(ExperimentalLayoutApi::class)

package dev.arkbuilders.components.about.presentation

import androidx.annotation.DrawableRes
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
Expand Down Expand Up @@ -164,7 +171,10 @@ fun ArkAbout(
text = stringResource(R.string.about_we_greatly_appreciate_every_bit_of_support),
color = ArkColor.TextTertiary
)
Row(modifier = Modifier.padding(top = 12.dp)) {
FlowRow(
modifier = Modifier.padding(top = 12.dp),
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
DonateBtn(
modifier = Modifier,
icon = painterResource(R.drawable.btc),
Expand All @@ -173,14 +183,17 @@ fun ArkAbout(
btcDialogVisible = true
}
DonateBtn(
modifier = Modifier.padding(start = 12.dp),
modifier = Modifier,
icon = painterResource(R.drawable.eth),
text = stringResource(R.string.about_donate_using_eth)
) {
ethDialogVisible = true
}
}
Row(modifier = Modifier.padding(top = 12.dp)) {
FlowRow(
modifier = Modifier.padding(top = 12.dp),
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
DonateBtn(
modifier = Modifier,
icon = painterResource(R.drawable.ic_about_patreon),
Expand All @@ -189,7 +202,7 @@ fun ArkAbout(
ctx.openLink(ctx.getString(R.string.about_ark_patreon_url))
}
DonateBtn(
modifier = Modifier.padding(start = 12.dp),
modifier = Modifier,
icon = painterResource(R.drawable.ic_about_coffee),
text = stringResource(R.string.about_buy_as_a_coffee)
) {
Expand All @@ -201,7 +214,10 @@ fun ArkAbout(
thickness = 1.dp,
color = ArkColor.BorderSecondary
)
Row(modifier = Modifier.padding(top = 12.dp, bottom = 50.dp)) {
FlowRow(
modifier = Modifier.padding(top = 12.dp, bottom = 50.dp),
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
OutlinedButton(
modifier = Modifier,
onClick = { ctx.openLink(ctx.getString(R.string.ark_contribute_url)) },
Expand All @@ -221,7 +237,7 @@ fun ArkAbout(
)
}
OutlinedButton(
modifier = Modifier.padding(start = 12.dp),
modifier = Modifier,
onClick = { },
border = BorderStroke(
width = 1.dp,
Expand Down
23 changes: 23 additions & 0 deletions about/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="about">О приложении</string>
<string name="privacy_policy">Политика конфиденциальности</string>
<string name="version">Версия %1$s</string>
<string name="copy">Копировать</string>
<string name="oops_something_went_wrong">Упс! Что-то пошло не так</string>
<string name="about_download_qr_image">Скачать изображение QR-кода</string>
<string name="about_wallet_copied">Кошелек скопирован!</string>
<string name="about_send_email_part_1">"Отправьте нам ID транзакции по электронной почте "</string>
<string name="about_send_email_part_2">" чтобы получить премиум-поддержку. Мы сделаем все возможное, чтобы помочь вам с любыми проблемами, с которыми вы столкнетесь при использовании нашего программного обеспечения."</string>
<string name="about_donate_eth">Пожертвовать Ethereum</string>
<string name="about_donate_btc">Пожертвовать Bitcoin</string>
<string name="about_discover_issues_to_work_on">Узнайте про проблемы, над которыми можно поработать</string>
<string name="about_see_open_bounties">Посмотреть открытые премии</string>
<string name="about_buy_as_a_coffee">Купите нам кофе</string>
<string name="about_donate_on_patreon">Пожертвовать на Patreon</string>
<string name="about_donate_using_eth">Пожертвовать с помощью ETH</string>
<string name="about_donate_using_btc">Пожертвовать с помощью BTC</string>
<string name="about_we_greatly_appreciate_every_bit_of_support">Мы очень ценим любую вашу поддержку!</string>
<string name="about_support_us">Поддержите нас</string>
<string name="website">Сайт</string>
</resources>
6 changes: 3 additions & 3 deletions about/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<string name="oops_something_went_wrong">Oops! Something went wrong</string>
<string name="about_download_qr_image">Download QR Image</string>
<string name="about_wallet_copied">Wallet copied!</string>
<string name="ark_support_email">[email protected]</string>
<string name="ark_support_email" translatable="false">[email protected]</string>
<string name="about_send_email_part_1">"Send us the transaction id by email "</string>
<string name="about_send_email_part_2">" to receive premium support. We’ll make our best to help you with any issue you encounter while using our Software."</string>
<string name="about_btc_wallet">bc1qx8n9r4uwpgrhgnamt2uew53lmrxd8tuevp7lv5</string>
<string name="about_eth_wallet">0x9765C5aC38175BFbd2dC7a840b63e50762B80a1b</string>
<string name="about_btc_wallet" translatable="false">bc1qx8n9r4uwpgrhgnamt2uew53lmrxd8tuevp7lv5</string>
<string name="about_eth_wallet" translatable="false">0x9765C5aC38175BFbd2dC7a840b63e50762B80a1b</string>
<string name="about_donate_eth">Donate using Ethereum</string>
<string name="about_donate_btc">Donate using Bitcoin</string>
<string name="ark_website_url" translatable="false">https://www.ark-builders.dev/</string>
Expand Down
26 changes: 25 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import java.net.URI
import java.util.Properties

pluginManagement {
repositories {
Expand All @@ -16,11 +17,21 @@ dependencyResolutionManagement {
url = URI("https://jitpack.io")
}
maven {
// Important note:
// To authenticate with GitHub Packages, you need to generate a fine-grained personal access token
// The token needs access only to [Public repositories]
// Add it as gpr.token=$token in local.properties file in the root of the project
// For more details, refer to the documentation:
// https://github.com/settings/personal-access-tokens/new
// https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-gradle-registry#authenticating-with-a-personal-access-token

val localProps = getLocalProps()

name = "GitHubPackages"
url = URI("https://maven.pkg.github.com/ARK-Builders/arklib-android")
credentials {
username = "token"
password = "\u0037\u0066\u0066\u0036\u0030\u0039\u0033\u0066\u0032\u0037\u0033\u0036\u0033\u0037\u0064\u0036\u0037\u0066\u0038\u0030\u0034\u0039\u0062\u0030\u0039\u0038\u0039\u0038\u0066\u0034\u0066\u0034\u0031\u0064\u0062\u0033\u0064\u0033\u0038\u0065"
password = localProps.getProperty("gpr.token") ?: System.getenv("GITHUB_TOKEN")
}
}
}
Expand All @@ -32,6 +43,19 @@ dependencyResolutionManagement {
}
}

fun getLocalProps(): Properties {
val props = Properties()
val localPropsFile = File(rootDir, "local.properties")

if (localPropsFile.exists()) {
localPropsFile.inputStream().use { stream ->
props.load(stream)
}
}

return props
}

rootProject.name = "Ark Components"
include(":scorewidget")
include(":tagselector")
Expand Down