diff --git a/README.md b/README.md index 22271d1..d876336 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ # Android.EweSticker -Project Icon +Feature Graphic Sticker-board for android inspired by uSticker (forked from woosticker). diff --git a/app/src/main/java/com/fredhappyface/ewesticker/ImageKeyboard.kt b/app/src/main/java/com/fredhappyface/ewesticker/ImageKeyboard.kt index e20c22f..e271ad0 100644 --- a/app/src/main/java/com/fredhappyface/ewesticker/ImageKeyboard.kt +++ b/app/src/main/java/com/fredhappyface/ewesticker/ImageKeyboard.kt @@ -304,11 +304,25 @@ class ImageKeyboard : InputMethodService(), StickerClickListener { } } + /** + * onStickerClicked + * + * When a sticker is tapped/ clicked. Update the cache and send the sticker + * + * @param sticker: File + */ override fun onStickerClicked(sticker: File) { this.recentCache.add(sticker.absolutePath) this.stickerSender.sendSticker(sticker) } + /** + * onStickerLongClicked + * + * When a sticker is long tapped/ clicked. Attach a new view to see an enlarged version of the sticker + * + * @param sticker: File + */ override fun onStickerLongClicked(sticker: File) { val fullStickerLayout = layoutInflater.inflate(R.layout.sticker_preview, this.keyboardRoot, false) as @@ -409,4 +423,3 @@ fun trimString(str: String): String { } return str } - diff --git a/app/src/main/java/com/fredhappyface/ewesticker/MainActivity.kt b/app/src/main/java/com/fredhappyface/ewesticker/MainActivity.kt index 29b02a7..d6b3a54 100644 --- a/app/src/main/java/com/fredhappyface/ewesticker/MainActivity.kt +++ b/app/src/main/java/com/fredhappyface/ewesticker/MainActivity.kt @@ -85,9 +85,9 @@ class MainActivity : AppCompatActivity() { /** * Called on button press to launch settings * - * @param view: View + * @param ignoredView: View */ - fun enableKeyboard(view: View) { + fun enableKeyboard(ignoredView: View) { val intent = Intent(Settings.ACTION_INPUT_METHOD_SETTINGS) startActivity(intent) } @@ -95,16 +95,23 @@ class MainActivity : AppCompatActivity() { /** * Called on button press to choose a new directory * - * @param view: View + * @param ignoredView: View */ - fun chooseDir(view: View) { + fun chooseDir(ignoredView: View) { val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE) intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) intent.addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION) chooseDirResultLauncher.launch(intent) } - fun reloadStickers(view: View) { + /** + * reloadStickers + * + * Call this function when a user taps the reload stickers button. If we have a set stickerDirPath, call importStickers() + * + * @param ignoredView: View + */ + fun reloadStickers(ignoredView: View) { val stickerDirPath = this.sharedPreferences.getString( "stickerDirPath", null ) diff --git a/app/src/main/java/com/fredhappyface/ewesticker/StickerImporter.kt b/app/src/main/java/com/fredhappyface/ewesticker/StickerImporter.kt index 9272644..9bb24f0 100644 --- a/app/src/main/java/com/fredhappyface/ewesticker/StickerImporter.kt +++ b/app/src/main/java/com/fredhappyface/ewesticker/StickerImporter.kt @@ -123,7 +123,9 @@ class StickerImporter( } } } - inputStream.close() + withContext(Dispatchers.IO) { + inputStream.close() + } totalStickers++ } } catch (_: IOException) { diff --git a/app/src/main/java/com/fredhappyface/ewesticker/adapter/StickerPackAdapter.kt b/app/src/main/java/com/fredhappyface/ewesticker/adapter/StickerPackAdapter.kt index a8b1c7a..86c8db5 100644 --- a/app/src/main/java/com/fredhappyface/ewesticker/adapter/StickerPackAdapter.kt +++ b/app/src/main/java/com/fredhappyface/ewesticker/adapter/StickerPackAdapter.kt @@ -42,7 +42,7 @@ class StickerPackAdapter( return@setOnLongClickListener true } holder.stickerThumbnail.setOnTouchListener { _, event -> - gestureDetector.onTouchEvent(event) + return@setOnTouchListener gestureDetector.onTouchEvent(event) } } diff --git a/app/src/main/lint.xml b/app/src/main/lint.xml new file mode 100644 index 0000000..274a24e --- /dev/null +++ b/app/src/main/lint.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3554d7b..9cebda0 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,13 +7,11 @@ android:background="@color/bg"> Paquete de etiqueta actualización Elija el directorio de fuente de la etiqueta Paquetes de etiqueta cargada actual Información: + Recargar pegatinas - Sendero: No se establece - Fecha: @@ -19,6 +20,8 @@ Opciones Mostrar botón atrás en navbar Usar layout vertical + Restaurar el teclado anterior al cerrar el teclado + Habilitar el deslizamiento entre paquetes (perpendicular a la dirección de desplazamiento) "Número de filas: " "Tamaño del icono: " @@ -61,5 +64,6 @@ Copyright © Randy Zhou E031: Algunos pegatinas no se importaron (%1$d importado).Pegatinas max alcanzadas E032: Algunos pegatinas no importaron (%1$d importado).Tamaño máximo del paquete alcanzado E033: Algunos pegatinas no importaron (%1$d importado).Formatos no compatibles encontrados + E034: Falló la recarga de stickers, intenta elegir un directorio de origen de stickers E041: IOException inesperado al convertir la pegatina diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cb42b2b..74e433b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -65,6 +65,6 @@ Copyright © Randy Zhou E031: Some stickers failed to import (%1$d imported). Max stickers reached E032: Some stickers failed to import (%1$d imported). Max pack size reached E033: Some stickers failed to import (%1$d imported). Unsupported formats found - E034: Reload stickers failed, try choosing a sticker source directory + E034: Reloading stickers failed, try choosing a sticker source directory E041: Unexpected IOException when converting sticker diff --git a/app/src/main/res/xml/full_backup_content.xml b/app/src/main/res/xml/full_backup_content.xml index e3ca821..1b2c6a3 100644 --- a/app/src/main/res/xml/full_backup_content.xml +++ b/app/src/main/res/xml/full_backup_content.xml @@ -1 +1,2 @@ + diff --git a/app/src/test/java/com/fredhappyface/ewesticker/ExampleUnitTest.kt b/app/src/test/java/com/fredhappyface/ewesticker/ExampleUnitTest.kt index ab3e863..795af3e 100644 --- a/app/src/test/java/com/fredhappyface/ewesticker/ExampleUnitTest.kt +++ b/app/src/test/java/com/fredhappyface/ewesticker/ExampleUnitTest.kt @@ -1,5 +1,9 @@ package com.fredhappyface.ewesticker +import org.hamcrest.MatcherAssert +import org.hamcrest.MatcherAssert.* +import org.hamcrest.Matchers +import org.hamcrest.Matchers.* import org.junit.Assert.assertEquals import org.junit.Test @@ -11,6 +15,6 @@ import org.junit.Test class ExampleUnitTest { @Test fun addition_isCorrect() { - assertEquals(4, 2 + 2) + assertThat(2 + 2, `is`(4)) } } diff --git a/readme-assets/icons/name.png b/readme-assets/icons/name.png deleted file mode 100644 index fc75660..0000000 Binary files a/readme-assets/icons/name.png and /dev/null differ diff --git a/readme-assets/icons/proj-icon.png b/readme-assets/icons/proj-icon.png deleted file mode 100644 index 082228d..0000000 Binary files a/readme-assets/icons/proj-icon.png and /dev/null differ