Skip to content

Commit 54d1ece

Browse files
rosuHdependabot[bot]weblatetryvseuSantosSi
authored
🔖 2.8.8 (#262)
* ⬆️ Bump fragment-ktx from 1.5.4 to 1.5.5 Bumps fragment-ktx from 1.5.4 to 1.5.5. --- updated-dependencies: - dependency-name: androidx.fragment:fragment-ktx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * ⬆️ Bump kotlinVersion from 1.7.20 to 1.8.0 Bumps `kotlinVersion` from 1.7.20 to 1.8.0. Updates `kotlin-gradle-plugin` from 1.7.20 to 1.8.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v1.7.20...v1.8.0) Updates `kotlin-stdlib` from 1.7.20 to 1.8.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v1.7.20...v1.8.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * ⬆️ Bump material from 1.8.0-alpha01 to 1.8.0-rc01 Bumps [material](https://github.com/material-components/material-components-android) from 1.8.0-alpha01 to 1.8.0-rc01. - [Release notes](https://github.com/material-components/material-components-android/releases) - [Commits](material-components/material-components-android@1.8.0-alpha01...1.8.0-rc01) --- updated-dependencies: - dependency-name: com.google.android.material:material dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * ⬆️ Bump profileinstaller from 1.2.0 to 1.2.2 Bumps profileinstaller from 1.2.0 to 1.2.2. --- updated-dependencies: - dependency-name: androidx.profileinstaller:profileinstaller dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * ⬆️ Bump appcompat from 1.5.0 to 1.6.0 Bumps appcompat from 1.5.0 to 1.6.0. --- updated-dependencies: - dependency-name: androidx.appcompat:appcompat dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * ⬆️ Bump roomVersion from 2.4.3 to 2.5.0 Bumps `roomVersion` from 2.4.3 to 2.5.0. Updates `room-runtime` from 2.4.3 to 2.5.0 Updates `room-ktx` from 2.4.3 to 2.5.0 Updates `room-compiler` from 2.4.3 to 2.5.0 --- updated-dependencies: - dependency-name: androidx.room:room-runtime dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: androidx.room:room-ktx dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: androidx.room:room-compiler dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * ⬆️ [Fix] - Upgrade Hilt due to compile error. * ⚡ * Added translation using Weblate (Norwegian Nynorsk) * Translated using Weblate (Norwegian Nynorsk) Currently translated at 66.6% (2 of 3 strings) Translation: EasyWatermark/App store metadata Translate-URL: https://hosted.weblate.org/projects/easywatermark/app-store-metadata/nn/ * Translated using Weblate (Norwegian Nynorsk) Currently translated at 90.4% (85 of 94 strings) Translation: EasyWatermark/App Strings Translate-URL: https://hosted.weblate.org/projects/easywatermark/app-strings/nn/ * Translations update from Hosted Weblate (#259) * Added translation using Weblate (Portuguese) * Translated using Weblate (Portuguese) Currently translated at 100.0% (94 of 94 strings) Translation: EasyWatermark/App Strings Translate-URL: https://hosted.weblate.org/projects/easywatermark/app-strings/pt/ --------- Co-authored-by: ssantos <ssantos@web.de> * - Add WRITE_EXTERNAL_STORAGE permission to ContextExtension. * - Bump up version code and name to 2.8.8 in build.gradle.kts. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Weblate <noreply@weblate.org> Co-authored-by: tryvseu <tryvseu@tuta.io> Co-authored-by: ssantos <ssantos@web.de>
1 parent db456ea commit 54d1ece

9 files changed

Lines changed: 192 additions & 16 deletions

File tree

‎app/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ android {
1515
applicationId = "me.rosuh.easywatermark"
1616
minSdk = (Apps.minSdk)
1717
targetSdk = (Apps.targetSdk)
18-
versionCode = 20807
19-
versionName = "2.8.7"
18+
versionCode = 20808
19+
versionName = "2.8.8"
2020
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2121
setProperty("archivesBaseName", "$applicationId-v$versionName($versionCode)")
2222
}

‎app/src/main/java/me/rosuh/easywatermark/utils/bitmap/BitmapCache.kt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,19 @@ import android.util.LruCache
99
* @author hi@rosuh.me
1010
*/
1111
object BitmapCache {
12-
1312
private val memoryCache: LruCache<BitmapInfo, BitmapValue> by lazy {
1413
object : LruCache<BitmapInfo, BitmapValue>(cacheSize) {
1514
override fun sizeOf(key: BitmapInfo?, value: BitmapValue?): Int {
1615
return if (value?.bitmap == null) {
1716
super.sizeOf(key, value)
1817
} else {
19-
value.bitmap.byteCount / 1024
18+
value.bitmap.allocationByteCount / 1024
2019
}
2120
}
2221
}
2322
}
2423

25-
private val maxMemory by lazy {
26-
(Runtime.getRuntime().maxMemory() / 1024).toInt()
27-
}
24+
private val maxMemory by lazy { (Runtime.getRuntime().maxMemory() / 1024).toInt() }
2825

2926
val cacheSize = maxMemory / 8
3027

‎app/src/main/java/me/rosuh/easywatermark/utils/ktx/ContextExtension.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ fun Activity.requestPermission() {
6363
} else {
6464
ActivityCompat.requestPermissions(
6565
this,
66-
arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE),
66+
arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE),
6767
MainActivity.REQ_CODE_REQ_WRITE_PERMISSION
6868
)
6969
}

‎app/src/main/res/values-nn/strings.xml‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="tips_choose_other_file_type">Ugildt bilete</string>
4+
<string name="error_save_oom">For lite minne. Stans bakgrunnsapper og røyn att</string>
5+
<string name="recovery_mode_closed">Lét att, røyn att</string>
6+
<string name="tile_mode_title_repeat">Gjentak</string>
7+
<string name="about_title_output">Utføringsformat</string>
8+
<string name="action_settings">Om</string>
9+
<string name="tips_confirm_dialog">Stadfest</string>
10+
<string name="title_text_size">Storleik</string>
11+
<string name="action_pick">Vel bilete</string>
12+
<string name="app_name">Easy Watermark</string>
13+
<string name="action_save">Gøym</string>
14+
<string name="title_layout">Utforming</string>
15+
<string name="title_style">Stil</string>
16+
<string name="title_content">Innhald</string>
17+
<string name="title_text_style">Stil</string>
18+
<string name="title_tile_mode">Flismodus</string>
19+
<string name="title_vertical_layout">Loddrett</string>
20+
<string name="tips_do_not_choose_image">Ingen bilete valde</string>
21+
<string name="tips_choose_color_dialog">Vel let</string>
22+
<string name="tips_cancel_dialog">Avbryt</string>
23+
<string name="tips_error">Mistak</string>
24+
<string name="title_horizon_layout">Vassrett</string>
25+
<string name="title_text_color">Let</string>
26+
<string name="title_text_rotate">Vinkel</string>
27+
<string name="about_title_about">Om</string>
28+
<string name="request_permission_failed">Fekk ikkje tilgjenge</string>
29+
<string name="about_title_info">Opplysingar</string>
30+
<string name="about_title_rating">Døm appen</string>
31+
<string name="about_title_version">Utgåve</string>
32+
<string name="error_not_img">Vel eit bilete</string>
33+
<string name="about_title_feed_back">Tilbakemelding</string>
34+
<string name="about_title_update_log">Brigdelogg</string>
35+
<string name="about_title_open_source">Løyve</string>
36+
<string name="dialog_export_to_gallery">Før ut til galleriet</string>
37+
<string name="water_mark_mode_image">Ikon</string>
38+
<string name="share">Del</string>
39+
<string name="water_mark_mode_text">Tekst</string>
40+
<string name="msg_crash">Vil du senda inn ein rapport om samanbrotet\? Han inneheld ikkje nokre personlege opplysingar og kan hjelpa oss med å betre appen.</string>
41+
<string name="error_file_not_found">Kunne anten ikkje opne biletet, eller so var det ikkje valt</string>
42+
<string name="tips_ok">Stadfest</string>
43+
<string name="tips_cancel_output">Avbryt</string>
44+
<string name="tips_need_compress_img">Anten for lite rom, eller for stort bilete</string>
45+
<string name="tips_compressing">Pakkar saman …</string>
46+
<string name="tips_compress_ok">Pakka saman. Trykk på «Greitt» for å gå til utføringa.</string>
47+
<string name="tips_compress_images">Pakk saman bilete</string>
48+
<string name="tips_compress_create_uri_failed">Pakka saman, men kunne ikkje lage URI-en. Byrj om appen og røyn att. %1$s</string>
49+
<string name="tips_tip_title">Samanbrot funne</string>
50+
<string name="crash_mail">Send e-brev</string>
51+
<string name="tip_not_mail_found">Fann ingen e-postklient. Du kan au lima inn mistakmeldinga på GitHub.</string>
52+
<string name="config_default_water_mark_text">👋 IKKJE DEL</string>
53+
<string name="style_alpha">Synlegskap</string>
54+
<string name="tips_not_app_can_open_images">Fann ingen filhandsamar.</string>
55+
<string name="dev_comment">Høgt nok utvikla teknologi ser ut som magi.</string>
56+
<string name="dialog_title_exist_confirm">Varsel</string>
57+
<string name="dialog_cancel_exist_confirm">Avbryt</string>
58+
<string name="dialog_content_exist_confirm">Avvis brigde\?</string>
59+
<string name="text_paint_fill">Fyll</string>
60+
<string name="text_paint_stroke">Strok</string>
61+
<string name="text_typeface_normal">Vanleg</string>
62+
<string name="text_typeface_bold">Feit</string>
63+
<string name="text_typeface_italic">Kursiv</string>
64+
<string name="text_typeface_bold_italic">Feit kursiv</string>
65+
<string name="dialog_save_export_list_title">Utføringsliste(%1$s)</string>
66+
<string name="dialog_open_in_gallery">Vis i galleri</string>
67+
<string name="dialog_save_config_format">Format</string>
68+
<string name="dialog_save_config_quality">Kvalitet</string>
69+
<string name="dialog_save_exporting">Fører ut</string>
70+
<string name="tips_pick_image">Vel bilete</string>
71+
<string name="pick_via_system">Meir …</string>
72+
<string name="recovery_title">Gjenopprettingsmodus</string>
73+
<string name="copy_success">Kopiert</string>
74+
<string name="store_not_found">Fann ingen appmarknad.</string>
75+
<string name="copy_failed">Kunne ikkje kopiera</string>
76+
<string name="copy">Kopier mistakmelding</string>
77+
<string name="dialog_title_template_edit">Brigd mal</string>
78+
<string name="back">Attende</string>
79+
<string name="turn_off_recovery_mode">Slå av gjenopprettingsmodus</string>
80+
<string name="dialog_title_template_title">Mal-liste</string>
81+
<string name="dialog_title_edit_watermark">Brigd vassmerke</string>
82+
<string name="dialog_button_add_template">Legg til</string>
83+
<string name="tips_list_empty">Ser tolleg tomt ut</string>
84+
<string name="tips_use_this_template">Nytt denne malen\?</string>
85+
<string name="tips_delete_template">Slett oppføringa\?</string>
86+
</resources>

‎app/src/main/res/values-pt/strings.xml‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="app_name">Easy Watermark</string>
4+
<string name="action_settings">Sobre</string>
5+
<string name="title_layout">Layout</string>
6+
<string name="title_style">Estilo</string>
7+
<string name="title_content">Conteúdo</string>
8+
<string name="tips_do_not_choose_image">Nenhuma imagem selecionada</string>
9+
<string name="tips_choose_color_dialog">Escolha a cor</string>
10+
<string name="tips_confirm_dialog">Confirmar</string>
11+
<string name="tips_cancel_dialog">Cancelar</string>
12+
<string name="tips_error">Falha</string>
13+
<string name="title_text_style">Fonte</string>
14+
<string name="title_text_size">Tamanho</string>
15+
<string name="about_title_update_log">Histórico de modificações</string>
16+
<string name="about_title_open_source">Software livre</string>
17+
<string name="error_not_img">Selecione uma imagem</string>
18+
<string name="error_file_not_found">A imagem não pôde ser aberta ou não foi selecionada</string>
19+
<string name="share">Compartilhar a imagem</string>
20+
<string name="about_title_feed_back">Opinião</string>
21+
<string name="tips_not_app_can_open_images">Nenhum gestor de ficheiros detectado.</string>
22+
<string name="tips_choose_other_file_type">Imagem inválida</string>
23+
<string name="error_save_oom">Memória insuficiente, por favor limpe os processos em segundo plano e tente novamente</string>
24+
<string name="dev_comment">Qualquer tecnologia suficientemente avançada é indistinguível da mágica.</string>
25+
<string name="dialog_title_exist_confirm">Aviso</string>
26+
<string name="dialog_cancel_exist_confirm">Cancelar</string>
27+
<string name="dialog_content_exist_confirm">Descartar a edição\?</string>
28+
<string name="text_paint_fill">Preencher</string>
29+
<string name="text_paint_stroke">Traço</string>
30+
<string name="text_typeface_normal">Normal</string>
31+
<string name="text_typeface_bold">Negrito</string>
32+
<string name="text_typeface_italic">Itálico</string>
33+
<string name="text_typeface_bold_italic">Negrito Itálico</string>
34+
<string name="store_not_found">Nenhuma loja instalada\?</string>
35+
<string name="recovery_mode_tips">Entrou no modo de recuperação devido a várias falhas. Enviar as informações do dispositivo e da falha abaixo por meio dos seguintes métodos pode resolver o problema. Obrigado.</string>
36+
<string name="tips_list_empty">Parece bem vazio</string>
37+
<string name="tips_delete_template">Apagar a entrada\?</string>
38+
<string name="tile_mode_title_repeat">Repetir</string>
39+
<string name="tile_mode_title_decal">Único</string>
40+
<string name="tips_use_this_template">Usar este modelo\?</string>
41+
<string name="tips_database_init_error">Falha na inicialização do banco de dados.</string>
42+
<string name="about_title_about">Sobre</string>
43+
<string name="about_title_info">Detalhes</string>
44+
<string name="about_title_output">Formato de saída</string>
45+
<string name="about_title_version">Versão</string>
46+
<string name="about_title_rating">Avalie nosso app</string>
47+
<string name="dialog_export_to_gallery">Exportar para Álbum</string>
48+
<string name="water_mark_mode_text">Texto</string>
49+
<string name="water_mark_mode_image">Ícone</string>
50+
<string name="tips_ok">Confirmar</string>
51+
<string name="action_pick">Escolha uma imagem</string>
52+
<string name="action_save">Gravar</string>
53+
<string name="title_tile_mode">Modo Tile</string>
54+
<string name="title_horizon_layout">Horizontal</string>
55+
<string name="title_vertical_layout">Vertical</string>
56+
<string name="title_text_color">Cor</string>
57+
<string name="title_text_rotate">Ângulo</string>
58+
<string name="request_permission_failed">Falha ao obter a permissão</string>
59+
<string name="tips_cancel_output">Cancelar</string>
60+
<string name="tips_need_compress_img">Não há espaço suficiente ou a imagem é muito grande</string>
61+
<string name="tips_compressing">Compactando…</string>
62+
<string name="tips_compress_images">Compactar a imagem</string>
63+
<string name="tips_compress_ok">Compactada. Clique OK para continuar a exportação.</string>
64+
<string name="tips_compress_create_uri_failed">Compactada mas falhou ao criar o Uri. Reinicie o App e tente de novo. %1$s</string>
65+
<string name="tips_tip_title">Falha detectada</string>
66+
<string name="msg_crash">Gostaria de relatar este problema\? Isto pode nos ajudar a melhorar o App e não coletará nenhuma informação pessoal.</string>
67+
<string name="crash_mail">Enviar um e-mail</string>
68+
<string name="tip_not_mail_found">Nenhum cliente do e-mail detectado. Alternativamente, pode colar a mensagem do erro na loja de apps ou no GitHub.</string>
69+
<string name="config_default_water_mark_text">👋 NÃO REDISTRIBUIR</string>
70+
<string name="style_alpha">Nitidez</string>
71+
<string name="dialog_save_export_list_title">Exportar lista(%1$s)</string>
72+
<string name="dialog_open_in_gallery">Ver na Galeria</string>
73+
<string name="dialog_save_config_format">Formato</string>
74+
<string name="dialog_save_config_quality">Qualidade</string>
75+
<string name="dialog_save_exporting">Exportando</string>
76+
<string name="tips_pick_image">Vamos começar selecionando uma imagem</string>
77+
<string name="pick_via_system">Choose more…</string>
78+
<string name="recovery_title">Modo de restauração</string>
79+
<string name="copy_success">Copiado</string>
80+
<string name="copy_failed">Cópia falhou</string>
81+
<string name="recovery_mode_closed">Reiniciar para atualizar modificações</string>
82+
<string name="tips_input_text_can_not_be_empty">O conteúdo não pode estar vazio</string>
83+
<string name="copy">Copiar registos</string>
84+
<string name="turn_off_recovery_mode">Desligar o modo de recuperação</string>
85+
<string name="back">Anterior</string>
86+
<string name="dialog_title_template_edit">Editar modelo</string>
87+
<string name="dialog_title_edit_watermark">\"Editar Marca D\'água\"</string>
88+
<string name="dialog_title_template_title">Lista de Modelos</string>
89+
<string name="dialog_button_add_template">Adicionar</string>
90+
</resources>

‎fastlane/metadata/android/nn/short_description.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Merk bilete med vassmerke.

‎fastlane/metadata/android/nn/title.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Easy Watermark

‎gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ kotlin.code.style=official
2222
org.gradle.parallel=true
2323
org.gradle.caching=true
2424
android.injected.testOnly=false
25+
org.gradle.unsafe.configuration-cache=true
2526
#org.gradle.unsafe.configuration-cache=true

‎settings.gradle.kts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ dependencyResolutionManagement {
88
versionCatalogs {
99
create("libs") {
1010
// plugins
11-
val kotlinVersion = "1.7.20"
12-
library("dagger-hilt-plugin", "com.google.dagger:hilt-android-gradle-plugin:2.42")
11+
val kotlinVersion = "1.8.0"
12+
library("dagger-hilt-plugin", "com.google.dagger:hilt-android-gradle-plugin:2.44.2")
1313
library("tools-gradle", "com.android.tools.build:gradle:7.3.1")
1414
library("kotlin-plugin", "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
1515
library("ktlint-gradle", "org.jlleitschuh.gradle:ktlint-gradle:10.1.0")
@@ -20,15 +20,15 @@ dependencyResolutionManagement {
2020
library("kotlin-coroutine-core", "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
2121

2222
// android platforms libs
23-
library("fragment-ktx", "androidx.fragment:fragment-ktx:1.5.4")
23+
library("fragment-ktx", "androidx.fragment:fragment-ktx:1.5.5")
2424
library("activity-ktx", "androidx.activity:activity-ktx:1.6.1")
2525
library("lifecycle-runtime-ktx", "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1")
2626
library("lifecycle-livedata-ktx", "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1")
2727
library("lifecycle-viewModel-ktx", "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
2828
library("core-ktx", "androidx.core:core-ktx:1.7.20")
29-
library("appcompat", "androidx.appcompat:appcompat:1.5.0")
30-
library("material", "com.google.android.material:material:1.8.0-alpha01")
31-
val roomVersion = "2.4.3"
29+
library("appcompat", "androidx.appcompat:appcompat:1.6.0")
30+
library("material", "com.google.android.material:material:1.8.0-rc01")
31+
val roomVersion = "2.5.0"
3232
library("room-runtime", "androidx.room:room-runtime:${roomVersion}")
3333
library("room-ktx", "androidx.room:room-ktx:${roomVersion}")
3434
library("room-compiler", "androidx.room:room-compiler:$roomVersion")
@@ -41,7 +41,7 @@ dependencyResolutionManagement {
4141
library("palette-ktx", "androidx.palette:palette-ktx:1.0.0")
4242

4343
// third party libs
44-
val daggerVersion = "2.43.2"
44+
val daggerVersion = "2.44.2"
4545
library("dagger-hilt-android", "com.google.dagger:hilt-android:${daggerVersion}")
4646
library("dagger-hilt-compiler", "com.google.dagger:hilt-compiler:${daggerVersion}")
4747

@@ -55,7 +55,7 @@ dependencyResolutionManagement {
5555

5656
// benchmark && test libs
5757
library("benchmark", "androidx.benchmark:benchmark-macro-junit4:1.1.1")
58-
library("profieinstaller", "androidx.profileinstaller:profileinstaller:1.2.0")
58+
library("profieinstaller", "androidx.profileinstaller:profileinstaller:1.2.2")
5959

6060
val testVersion = "1.4.0"
6161
library("test-core", "androidx.test:core:${testVersion}")

0 commit comments

Comments
 (0)