linting fixes, cleanup and other code improvements
This commit is contained in:
Kieran W
parent
d7bf8f1c12
commit
66809b6a8e
33
.idea/inspectionProfiles/Project_Default.xml
generated
33
.idea/inspectionProfiles/Project_Default.xml
generated
@ -40,7 +40,6 @@
|
||||
<inspection_tool class="AndroidLintNegativeMargin" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AndroidLintNewerVersionAvailable" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AndroidLintNoHardKeywords" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AndroidLintPermissionImpliesUnsupportedChromeOsHardware" enabled="true" level="ERROR" enabled_by_default="true" />
|
||||
<inspection_tool class="AndroidLintRegistered" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AndroidLintSelectableText" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AndroidLintStopShip" enabled="true" level="ERROR" enabled_by_default="true" />
|
||||
@ -51,6 +50,7 @@
|
||||
<inspection_tool class="AndroidLintUnsupportedChromeOsHardware" enabled="true" level="ERROR" enabled_by_default="true" />
|
||||
<inspection_tool class="AndroidLintUnusedIds" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AndroidLintValidActionsXml" enabled="true" level="ERROR" enabled_by_default="true" />
|
||||
<inspection_tool class="AndroidLintVectorRaster" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||
<inspection_tool class="AndroidLintWrongThreadInterprocedural" enabled="true" level="ERROR" enabled_by_default="true" />
|
||||
<inspection_tool class="Annotation" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AnnotationClass" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
@ -71,7 +71,6 @@
|
||||
<inspection_tool class="AssertStatement" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AssertWithoutMessage" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AssignmentOrReturnOfFieldWithMutableType" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AssignmentToCatchBlockParameter" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AssignmentToForLoopParameter" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
<option name="m_checkForeachParameters" value="true" />
|
||||
</inspection_tool>
|
||||
@ -82,11 +81,9 @@
|
||||
<inspection_tool class="AssignmentToNull" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AssignmentToStaticFieldFromInstanceMethod" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AssignmentToSuperclassField" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AssignmentUsedAsCondition" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AutoBoxing" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
<option name="ignoreAddedToCollection" value="false" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AutoUnboxing" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AwaitNotInLoop" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AwaitWithoutCorrespondingSignal" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
@ -112,7 +109,6 @@
|
||||
</inspection_tool>
|
||||
<inspection_tool class="BadOddness" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="BigDecimalEquals" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="BigDecimalLegacyMethod" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="BlockMarkerComments" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="BooleanExpressionMayBeConditional" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="BooleanMethodNameMustStartWithQuestion" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
@ -223,7 +219,6 @@
|
||||
<inspection_tool class="CloneableImplementsClone" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
<option name="m_ignoreCloneableDueToInheritance" value="false" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="CollectionContainsUrl" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="CollectionsFieldAccessReplaceableByMethodCall" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="CollectionsMustHaveInitialCapacity" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="ComparableImplementedButEqualsNotOverridden" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
@ -231,7 +226,6 @@
|
||||
<inspection_tool class="CompareToUsesNonFinalVariable" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="ComparisonOfShortAndChar" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="ConditionSignal" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="ConditionalExpressionWithIdenticalBranches" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="ConfusingFloatingPointLiteral" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="ConfusingMainMethod" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="ConfusingOctalEscape" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
@ -270,9 +264,6 @@
|
||||
<inspection_tool class="DirectUseOfResultType" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="DisjointPackage" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="DollarSignInName" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="DoubleCheckedLocking" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
<option name="ignoreOnVolatileVariables" value="false" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="DoubleLiteralMayBeFloatLiteral" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="DriverManagerGetConnection" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="DuplicateStringLiteralInspection" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
@ -288,12 +279,10 @@
|
||||
<option name="ignoreThrowables" value="true" />
|
||||
<option name="commentsAreContent" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="EmptySynchronizedStatement" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="EnumClass" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="EnumerationCanBeIteration" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="EqualsAndHashcode" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="EqualsCalledOnEnumConstant" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="EqualsHashCodeCalledOnUrl" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="EqualsUsesNonFinalVariable" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="ErrorRethrown" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="ExceptionFromCatchWhichDoesntWrap" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
@ -332,11 +321,9 @@
|
||||
<inspection_tool class="FieldNotUsedInToString" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="FinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="FinalMethod" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="FinalMethodInFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="Finalize" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
<option name="ignoreTrivialFinalizers" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="FinalizeNotProtected" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="FloatingPointEquality" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="ForLoopWithMissingComponent" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
<option name="ignoreCollectionLoops" value="false" />
|
||||
@ -536,7 +523,6 @@
|
||||
<inspection_tool class="NestingDepth" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
<option name="m_limit" value="5" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="NewClassNamingConvention" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="NewExceptionWithoutArguments" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="NewMethodNamingConvention" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="NonBooleanMethodNameMayNotStartWithQuestion" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
@ -549,7 +535,6 @@
|
||||
</inspection_tool>
|
||||
<inspection_tool class="NonExceptionNameEndsWithException" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="NonFinalClone" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="NonFinalFieldInEnum" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="NonFinalFieldInImmutable" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="NonFinalFieldOfException" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="NonFinalGuard" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
@ -658,7 +643,6 @@
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PermissionUsageInspection" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="PointlessIndexOfComparison" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="PrivateMemberAccessBetweenOuterAndInnerClass" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="ProblematicVarargsMethodOverride" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="ProhibitJvmOverloadsOnConstructorsOfAnnotationClassesMigration" enabled="true" level="ERROR" enabled_by_default="true" />
|
||||
<inspection_tool class="ProhibitRepeatedUseSiteTargetAnnotationsMigration" enabled="true" level="ERROR" enabled_by_default="true" />
|
||||
@ -670,7 +654,6 @@
|
||||
<option name="ignoreEnums" value="false" />
|
||||
<option name="ignoreInterfaces" value="false" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="ProtectedMemberInFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="PublicApiImplicitType" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="PublicConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="PublicConstructorInNonPublicClass" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
@ -733,10 +716,7 @@
|
||||
<inspection_tool class="SerialPersistentFieldsWithWrongSignature" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="SerialVersionUIDNotStaticFinal" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="SerializableDeserializableClassInSecureContext" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="SerializableHasSerialVersionUIDField" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
<option name="ignoreAnonymousInnerClasses" value="false" />
|
||||
<option name="superClassString" value="java.awt.Component" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="SerializableHasSerialVersionUIDField" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="SerializableHasSerializationMethods" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
<option name="ignoreAnonymousInnerClasses" value="false" />
|
||||
<option name="superClassString" value="java.awt.Component" />
|
||||
@ -810,7 +790,6 @@
|
||||
<inspection_tool class="SuppressionAnnotation" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="SuspiciousArrayCast" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="SuspiciousGetterSetter" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="SuspiciousIndentAfterControlStatement" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="SuspiciousLiteralUnderscore" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="SwitchStatement" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="SwitchStatementDensity" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
@ -833,7 +812,6 @@
|
||||
<inspection_tool class="SystemGetenv" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="SystemOutErr" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="SystemProperties" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="SystemRunFinalizersOnExit" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="SystemSetSecurityManager" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="TestCaseInProductCode" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="TestCaseWithConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
@ -877,7 +855,6 @@
|
||||
<option name="onlyWeakentoInterface" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="TypeParameterExtendsFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="UnaryPlus" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="UncheckedExceptionClass" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="UnconditionalWait" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="UndeclaredTests" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
@ -900,9 +877,6 @@
|
||||
<inspection_tool class="UnnecessarySuperConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="UnnecessarySuperQualifier" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="UnnecessaryThis" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="UnnecessaryToStringCall" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="UnnecessaryUnaryMinus" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="UnnecessaryUnicodeEscape" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="UnqualifiedFieldAccess" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="UnqualifiedInnerClassAccess" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
<option name="ignoreReferencesToLocalInnerClasses" value="true" />
|
||||
@ -947,7 +921,6 @@
|
||||
<inspection_tool class="WaitNotInLoop" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="WaitNotifyNotInSynchronizedContext" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="WaitOrAwaitWithoutTimeout" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="WaitWhileHoldingTwoLocks" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="WaitWithoutCorrespondingNotify" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="WarningOnMainUnusedParameterMigration" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="WeakerAccess" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
@ -958,4 +931,4 @@
|
||||
<inspection_tool class="WhenWithOnlyElse" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="ZeroLengthArrayInitialization" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
</profile>
|
||||
</component>
|
||||
</component>
|
||||
@ -34,6 +34,15 @@ tasks.register("genDocs") {
|
||||
android {
|
||||
compileSdk = 33
|
||||
buildToolsVersion = "34.0.0"
|
||||
namespace = "com.fredhappyface.ewesticker"
|
||||
|
||||
kotlinOptions {
|
||||
jvmTarget = "17"
|
||||
}
|
||||
|
||||
androidResources {
|
||||
generateLocaleConfig = true
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
applicationId = "com.fredhappyface.ewesticker"
|
||||
@ -48,7 +57,6 @@ android {
|
||||
buildTypes {
|
||||
getByName("debug") { versionNameSuffix = "-debug" }
|
||||
getByName("release") {
|
||||
// versionNameSuffix = "-release"
|
||||
proguardFiles("proguard-android-optimize.txt", "proguard-rules.pro")
|
||||
isMinifyEnabled = false
|
||||
}
|
||||
@ -58,9 +66,6 @@ android {
|
||||
sourceCompatibility(JavaVersion.VERSION_17)
|
||||
targetCompatibility(JavaVersion.VERSION_17)
|
||||
}
|
||||
|
||||
kotlinOptions { jvmTarget = "17" }
|
||||
namespace = "com.fredhappyface.ewesticker"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
@ -74,11 +79,10 @@ dependencies {
|
||||
implementation("io.coil-kt:coil-gif:2.4.0")
|
||||
implementation("io.coil-kt:coil-video:2.4.0")
|
||||
implementation("androidx.gridlayout:gridlayout:1.0.0")
|
||||
implementation("io.noties.markwon:core:4.6.2")
|
||||
testImplementation("junit:junit:4.13.2")
|
||||
testImplementation("androidx.test.ext:junit:1.1.5")
|
||||
testImplementation("androidx.test.espresso:espresso-core:3.5.1")
|
||||
implementation("com.google.code.gson:gson:2.10.1")
|
||||
implementation("io.noties.markwon:core:4.6.2")
|
||||
}
|
||||
|
||||
ktlint {
|
||||
|
||||
@ -338,8 +338,10 @@ class ImageKeyboard : InputMethodService(), StickerClickListener {
|
||||
fSticker.layoutParams.width = this.fullIconSize
|
||||
fSticker.load(sticker)
|
||||
val fText = fullStickerLayout.findViewById<TextView>(R.id.stickerInfo)
|
||||
fText.text =
|
||||
"${trimString(sticker.name)} (Pack: ${trimString(sticker.parent.split('/').last())})"
|
||||
val stickerName = trimString(sticker.name)
|
||||
val packName = trimString(sticker.parent.split('/').last())
|
||||
fText.text = getString(R.string.sticker_pack_info, stickerName, packName)
|
||||
|
||||
// Tap to exit popup
|
||||
fullStickerLayout.setOnClickListener { this.keyboardRoot.removeView(it) }
|
||||
fSticker.setOnClickListener { this.keyboardRoot.removeView(fullStickerLayout) }
|
||||
@ -417,6 +419,14 @@ class ImageKeyboard : InputMethodService(), StickerClickListener {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* trimString
|
||||
*
|
||||
* for strings longer than 32 chars, trim to 32 chars and add ellipsis ...
|
||||
*
|
||||
* @param str: String
|
||||
* @return String
|
||||
*/
|
||||
fun trimString(str: String): String {
|
||||
if (str.length > 32) {
|
||||
return str.substring(0, 32) + "..."
|
||||
|
||||
@ -247,7 +247,7 @@ class MainActivity : AppCompatActivity() {
|
||||
}
|
||||
|
||||
/** Reusable function to warn about changing preferences */
|
||||
internal fun showChangedPrefText() {
|
||||
private fun showChangedPrefText() {
|
||||
this.toaster.toast(
|
||||
getString(R.string.pref_000)
|
||||
)
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
package com.fredhappyface.ewesticker.utilities
|
||||
|
||||
import android.content.Context
|
||||
import androidx.preference.PreferenceManager
|
||||
import com.fredhappyface.ewesticker.model.StickerPack
|
||||
import com.google.gson.Gson
|
||||
import com.google.gson.JsonSyntaxException
|
||||
import com.google.gson.reflect.TypeToken
|
||||
|
||||
object SharedPrefHelper {
|
||||
private const val KEY_STICKERS = "com.fredhappyface.ewesticker.pref.stickers"
|
||||
|
||||
fun getStickerPacksFromPref(context: Context): List<StickerPack> {
|
||||
val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
|
||||
val gson = Gson()
|
||||
val json = sharedPreferences.getString(KEY_STICKERS, null) ?: return emptyList()
|
||||
|
||||
return try {
|
||||
gson.fromJson(json, object : TypeToken<ArrayList<StickerPack>>() {}.type)
|
||||
} catch (e: JsonSyntaxException) {
|
||||
emptyList()
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -3,8 +3,7 @@
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/activityMainRoot"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/bg">
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<com.google.android.material.appbar.AppBarLayout
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
android:id="@+id/keyboardRoot"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/bg"
|
||||
tools:context="com.fredhappyface.ewesticker.ImageKeyboard">
|
||||
|
||||
<HorizontalScrollView
|
||||
|
||||
@ -2,8 +2,7 @@
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/packContent"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/bg">
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/stickerInfo"
|
||||
|
||||
1
app/src/main/res/resources.properties
Normal file
1
app/src/main/res/resources.properties
Normal file
@ -0,0 +1 @@
|
||||
unqualifiedResLocale=en
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="PluralsCandidate">
|
||||
<resources>
|
||||
<!-- معلومات التطبيق -->
|
||||
<string name="pack_icon">أيقونة الحزمة</string>
|
||||
<string name="sticker_icon">أيقونة الملصق</string>
|
||||
@ -71,4 +71,6 @@
|
||||
<string name="imported_033">E033: فشل بعض الملصقات في الاستيراد (%1$d تم استيرادها). تم العثور على تنسيقات غير مدعومة</string>
|
||||
<string name="imported_034">E034: فشلت عملية إعادة تحميل الملصقات، حاول اختيار مجلد مصدر الملصقات</string>
|
||||
<string name="fallback_041">E041: حدث استثناء غير متوقع أثناء تحويل الملصق</string>
|
||||
</resources>
|
||||
<!-- Keyboard -->
|
||||
<string name="sticker_pack_info">%1$s (حزمة: %2$s)</string>
|
||||
</resources>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="PluralsCandidate">
|
||||
<resources>
|
||||
<!-- অ্যাপ তথ্য -->
|
||||
<string name="pack_icon">প্যাক আইকন</string>
|
||||
<string name="sticker_icon">স্টিকার আইকন</string>
|
||||
@ -71,4 +71,6 @@
|
||||
<string name="imported_033">E033: কিছু স্টিকার আমদানি করা হয়নি (%1$d টি আমদানি করা হয়েছে)। সমর্থিত ফর্ম্যাট পাওয়া হয়নি</string>
|
||||
<string name="imported_034">E034: স্টিকার পুনরায় লোড করা যায়নি, স্টিকার শোর্স ডিরেক্টরি চয়ন করার চেষ্টা করুন</string>
|
||||
<string name="fallback_041">E041: অপ্রত্যাশিত IOException যখন স্টিকার রুপান্তর করা হয়</string>
|
||||
</resources>
|
||||
<!-- Keyboard -->
|
||||
<string name="sticker_pack_info">%1$s (প্যাক: %2$s)</string>
|
||||
</resources>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="PluralsCandidate">
|
||||
<resources>
|
||||
<!-- App-Informationen -->
|
||||
<string name="pack_icon">Pack-Symbol</string>
|
||||
<string name="sticker_icon">Sticker-Symbol</string>
|
||||
@ -71,4 +71,6 @@
|
||||
<string name="imported_033">E033: Einige Sticker konnten nicht importiert werden (%1$d importiert). Nicht unterstützte Formate gefunden</string>
|
||||
<string name="imported_034">E034: Neuladen der Sticker fehlgeschlagen, versuche ein Sticker-Quellverzeichnis auszuwählen</string>
|
||||
<string name="fallback_041">E041: Unerwarteter IOException beim Konvertieren des Stickers</string>
|
||||
</resources>
|
||||
<!-- Keyboard -->
|
||||
<string name="sticker_pack_info">%1$s (Paket: %2$s)</string>
|
||||
</resources>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="PluralsCandidate">
|
||||
<resources>
|
||||
<!-- App info -->
|
||||
<string name="pack_icon">Ícono del paquete</string>
|
||||
<string name="sticker_icon">Ícono del sticker</string>
|
||||
@ -71,4 +71,6 @@
|
||||
<string name="imported_033">E033: Algunos pegatinas no importaron (%1$d importado).Formatos no compatibles encontrados</string>
|
||||
<string name="imported_034">E034: Falló la recarga de stickers, intenta seleccionar un directorio de origen de stickers</string>
|
||||
<string name="fallback_041">E041: IOException inesperado al convertir la pegatina</string>
|
||||
</resources>
|
||||
<!-- Keyboard -->
|
||||
<string name="sticker_pack_info">%1$s (Paquete: %2$s)</string>
|
||||
</resources>
|
||||
|
||||
@ -1,29 +1,29 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="pack_icon">Icône du paquet</string>
|
||||
<string name="sticker_icon">Icône de l\'autocollant</string>
|
||||
<string name="sticker_icon">Icône de l’autocollant</string>
|
||||
<string name="close_sticker_preview">[appuyer pour fermer l\'aperçu de l\'autocollant]</string>
|
||||
<string name="enable_keyboard_heading">Activer le clavier</string>
|
||||
<string name="enable_keyboard_button">Réglages de lancement</string>
|
||||
<string name="update_sticker_pack_heading">Mettre à jour le paquet d\'autocollant</string>
|
||||
<string name="update_sticker_pack_button">Choisissez le répertoire source d\'autocollants</string>
|
||||
<string name="update_sticker_pack_heading">Mettre à jour le paquet d’autocollant</string>
|
||||
<string name="update_sticker_pack_button">Choisissez le répertoire source d’autocollants</string>
|
||||
<string name="reload_sticker_pack_button">Recharger les autocollants</string>
|
||||
<string name="update_sticker_pack_info_path_lbl">- Chemin :</string>
|
||||
<string name="imported_033">E033 : Certains autocollants n\'ont pas été importés (%1$d importés). Formats non pris en charge trouvés</string>
|
||||
<string name="imported_034">E034 : Impossible de recharger les autocollants, essayez de choisir un répertoire source d\'autocollants</string>
|
||||
<string name="fallback_041">E041 : IOException inattendue lors de la conversion de l\'autocollant</string>
|
||||
<string name="update_sticker_pack_info">Informations actuelles sur les autocollants chargés :</string>
|
||||
<string name="update_sticker_pack_info_path_lbl">- Chemin:</string>
|
||||
<string name="imported_033">E033: Certains autocollants n’ont pas été importés (%1$d importés). Formats non pris en charge trouvés</string>
|
||||
<string name="imported_034">E034: Impossible de recharger les autocollants, essayez de choisir un répertoire source d’autocollants</string>
|
||||
<string name="fallback_041">E041: IOException inattendue lors de la conversion de l’autocollant</string>
|
||||
<string name="update_sticker_pack_info">Informations actuelles sur les autocollants chargés:</string>
|
||||
<string name="update_sticker_pack_info_path">Non défini</string>
|
||||
<string name="update_sticker_pack_info_date_lbl">- Date :</string>
|
||||
<string name="update_sticker_pack_info_date_lbl">- Date:</string>
|
||||
<string name="update_sticker_pack_info_date">Jamais</string>
|
||||
<string name="update_sticker_pack_info_total_lbl">- Total :</string>
|
||||
<string name="update_sticker_pack_info_total_lbl">- Total:</string>
|
||||
<string name="options_heading">Options</string>
|
||||
<string name="options_show_back_button">Afficher le bouton dans la barre de navigation</string>
|
||||
<string name="options_vertical">Utiliser la mise en page verticale</string>
|
||||
<string name="options_restore_on_close">Restaurer le clavier précédent en fermant le clavier</string>
|
||||
<string name="options_scroll">Permet de glisser entre les paquets (perpendiculaire à la direction de défilement)</string>
|
||||
<string name="options_icons_per_x_lbl">"Nombre de rangées : "</string>
|
||||
<string name="options_icon_size_status_lbl">"Taille de l\'icône "</string>
|
||||
<string name="options_icons_per_x_lbl">"Nombre de rangées: "</string>
|
||||
<string name="options_icon_size_status_lbl">"Taille de l’icône "</string>
|
||||
<string name="info_heading">Infos</string>
|
||||
<string name="info_text">EweSticker est une application de clavier d\'autocollant Android, spécialement conçue pour partager une grande variété d\'autocollants personnalisés dans les applications de messagerie prises en charge. Ce projet s\'inspire du projet uSticker et est une fourche du dépôt woosticker.</string>
|
||||
<string name="features_heading">Caractéristiques</string>
|
||||
@ -42,8 +42,8 @@
|
||||
\n- **Sticker Preview on Long Press**: Pour faciliter la sélection des autocollants, les utilisateurs peuvent faire pression sur un autocollant pour révéler un aperçu. Cette fonctionnalité aide les utilisateurs à décider rapidement quel autocollant ils veulent partager sans avoir à ouvrir la collection d\'autocollants séparément.
|
||||
\n
|
||||
\nEweSticker propose un large éventail d\'options de personnalisation, un support de format divers et une intégration avec des applications de messagerie. Que les utilisateurs partagent des images statiques, des GIF animés ou même des vidéos courtes, l\'application vise à fournir un moyen attrayant et expressif de communiquer en utilisant des autocollants personnalisés.</string>
|
||||
<string name="how_to_use_heading">Comment l\'utiliser</string>
|
||||
<string name="how_to_use_text">Sélectionnez un répertoire contenant des autocollants et envoyez-les dans vos applications préférées !</string>
|
||||
<string name="how_to_use_heading">Comment l’utiliser</string>
|
||||
<string name="how_to_use_text">Sélectionnez un répertoire contenant des autocollants et envoyez-les dans vos applications préférées!</string>
|
||||
<string name="license_heading">Licence MIT</string>
|
||||
<string name="license_text">Copyright © FredHappyface
|
||||
\nCopyright © Randy Zhou</string>
|
||||
@ -52,13 +52,15 @@
|
||||
\n
|
||||
\n- Les tutoriels vous emmènent à la main par une série de étapes pour commencer à utiliser le logiciel. Commencez ici si vous êtes nouveau: https://github.com/FredHappyface/Android.EweSticker/blob/main/documentation/tutorials
|
||||
\n
|
||||
\n- Le guide d\'aide fournit un point de départ et décrit les questions fréquentes que vous pouvez avoir : https://github.com/FredHappyface/Android.EweSticker/blob/main/documentation/help
|
||||
\n- Le guide d\'aide fournit un point de départ et décrit les questions fréquentes que vous pouvez avoir: https://github.com/FredHappyface/Android.EweSticker/blob/main/documentation/help
|
||||
\n
|
||||
\n- Licence MIT
|
||||
\n(Voir la licence pour plus d\'informations https://github.com/FredHappyface/Android.EweSticker/blob/main/LICENSE.md )</string>
|
||||
<string name="pref_000">Les préférences ont changé. Recharger le clavier pour les appliquer</string>
|
||||
<string name="imported_010">Démarrage de l\'importation. Ceci va prendre du temps !</string>
|
||||
<string name="imported_010">Démarrage de l’importation. Ceci va prendre du temps!</string>
|
||||
<string name="imported_020">Autocollants importés %1$d. Recharger le clavier pour afficher les nouveaux autocollants</string>
|
||||
<string name="imported_031">E031 : Certains autocollants n\'ont pas été importés (%1$d importés). Nombre maximal atteint</string>
|
||||
<string name="imported_032">E032 : Certains autocollants n\'ont pas été importés (%1$d importés). Taille maximale du paquet atteint</string>
|
||||
</resources>
|
||||
<string name="imported_031">E031: Certains autocollants n’ont pas été importés (%1$d importés). Nombre maximal atteint</string>
|
||||
<string name="imported_032">E032: Certains autocollants n’ont pas été importés (%1$d importés). Taille maximale du paquet atteint</string>
|
||||
<!-- Keyboard -->
|
||||
<string name="sticker_pack_info">%1$s (Pack : %2$s)</string>
|
||||
</resources>
|
||||
|
||||
@ -70,4 +70,6 @@
|
||||
<string name="imported_033">E033: कुछ स्टिकर्स का आयात असफल रहा (%1$d आयात किए गए)। असमर्थित प्रारूप मिला</string>
|
||||
<string name="imported_034">E034: स्टिकर्स को पुनः लोड करने में विफलता हुई, कृपया स्टिकर स्रोत निर्दिष्ट करने का प्रयास करें</string>
|
||||
<string name="fallback_041">E041: स्टिकर कन्वर्ट करते समय अप्रत्याशित IOException</string>
|
||||
<!-- Keyboard -->
|
||||
<string name="sticker_pack_info">%1$s (पैक: %2$s)</string>
|
||||
</resources>
|
||||
@ -71,4 +71,6 @@
|
||||
<string name="imported_033">E033: Beberapa stiker gagal diimpor (%1$d diimpor). Format yang tidak didukung ditemukan</string>
|
||||
<string name="imported_034">E034: Gagal memuat ulang stiker, coba pilih direktori sumber stiker</string>
|
||||
<string name="fallback_041">E041: IOException yang tidak diharapkan saat mengonversi stiker</string>
|
||||
<!-- Keyboard -->
|
||||
<string name="sticker_pack_info">%1$s (Paket: %2$s)</string>
|
||||
</resources>
|
||||
@ -70,4 +70,6 @@
|
||||
<string name="imported_033">E033: 一部のステッカーのインポートに失敗しました（%1$d 個インポート済み）。サポートされていないフォーマットが見つかりました</string>
|
||||
<string name="imported_034">E034: ステッカーの再読み込みに失敗しました。ステッカーソースディレクトリを選択してみてください</string>
|
||||
<string name="fallback_041">E041: ステッカーを変換する際に予期しないIOExceptionが発生しました</string>
|
||||
<!-- Keyboard -->
|
||||
<string name="sticker_pack_info">%1$s（パック：%2$s）</string>
|
||||
</resources>
|
||||
@ -1,7 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<!-- 앱 정보 -->
|
||||
<string name="app_name" translatable="false">EweSticker</string>
|
||||
<string name="pack_icon">팩 아이콘</string>
|
||||
<string name="sticker_icon">스티커 아이콘</string>
|
||||
<string name="close_sticker_preview">[스티커 미리보기 닫기를 탭하세요]</string>
|
||||
@ -72,4 +71,6 @@
|
||||
<string name="imported_033">E033: 일부 스티커 가져오기 실패 (%1$d개 가져옴). 지원하지 않는 형식을 발견함</string>
|
||||
<string name="imported_034">E034: 스티커 다시 불러오기 실패. 스티커 소스 디렉터리를 선택해보세요</string>
|
||||
<string name="fallback_041">E041: 스티커 변환 중 예기치 않은 IOException 발생</string>
|
||||
<!-- Keyboard -->
|
||||
<string name="sticker_pack_info">%1$s (팩: %2$s)</string>
|
||||
</resources>
|
||||
@ -1,6 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name" translatable="false">EweSticker</string>
|
||||
<string name="pack_icon">Ícone do Pacote</string>
|
||||
<string name="sticker_icon">Ícone do Adesivo</string>
|
||||
<string name="close_sticker_preview">[toque para fechar a pré-visualização de adesivos]</string>
|
||||
@ -71,4 +70,6 @@ Direitos autorais © Randy Zhou</string>
|
||||
<string name="imported_033">E033: Alguns adesivos não puderam ser importados (%1$d importados). Formatos não suportados encontrados</string>
|
||||
<string name="imported_034">E034: Falha ao recarregar adesivos, tente escolher um diretório de origem dos adesivos</string>
|
||||
<string name="fallback_041">E041: IOException inesperada ao converter adesivo</string>
|
||||
<!-- Keyboard -->
|
||||
<string name="sticker_pack_info">%1$s (Pacote: %2$s)</string>
|
||||
</resources>
|
||||
@ -70,4 +70,6 @@
|
||||
<string name="imported_033">E033: Не удалось импортировать некоторые стикеры (%1$d импортировано). Обнаружены не поддерживаемые форматы</string>
|
||||
<string name="imported_034">E034: Перезагрузка стикеров не удалась, попробуйте выбрать каталог источника стикеров</string>
|
||||
<string name="fallback_041">E041: Неожиданная ошибка ввода-вывода при преобразовании стикера</string>
|
||||
<!-- Keyboard -->
|
||||
<string name="sticker_pack_info">%1$s (Пакет: %2$s)</string>
|
||||
</resources>
|
||||
@ -1,7 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<!-- ایپ کی معلومات -->
|
||||
<string name="app_name" translatable="false">EweSticker</string>
|
||||
<string name="pack_icon">پیک آئکن</string>
|
||||
<string name="sticker_icon">اسٹکر آئکن</string>
|
||||
<string name="close_sticker_preview">[اسٹکر پیشنظری کو بند کرنے کے لئے ٹیپ کریں]</string>
|
||||
@ -72,4 +71,6 @@
|
||||
<string name="imported_033">E033: کچھ اسٹکر منتقل کرنے میں ناکامی (%1$d منتقل کیے گئے). غیر معاون فارمیٹس پائے گئے</string>
|
||||
<string name="imported_034">E034: اسٹکرز دوبارہ لوڈ کرنے میں ناکامی. ایک اسٹکر سورس ڈائریکٹری منتخب کرنے کا کوشش کریں</string>
|
||||
<string name="fallback_041">E041: اسٹکر کو تبدیل کرنے کے دوران غیر متوقع IOException کا اعلان</string>
|
||||
<!-- Keyboard -->
|
||||
<string name="sticker_pack_info">%1$s (پیک: %2$s)</string>
|
||||
</resources>
|
||||
@ -1,7 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<!-- 应用信息 -->
|
||||
<string name="app_name" translatable="false">EweSticker</string>
|
||||
<string name="pack_icon">包图标</string>
|
||||
<string name="sticker_icon">贴纸图标</string>
|
||||
<string name="close_sticker_preview">[点击关闭贴纸预览]</string>
|
||||
@ -72,4 +71,6 @@
|
||||
<string name="imported_033">E033: 一些贴纸未能导入（已导入 %1$d 个）。发现不受支持的格式</string>
|
||||
<string name="imported_034">E034: 重新加载贴纸失败，请尝试选择贴纸源目录</string>
|
||||
<string name="fallback_041">E041: 在转换贴纸时发生意外的 IOException</string>
|
||||
<!-- Keyboard -->
|
||||
<string name="sticker_pack_info">%1$s（包： %2$s）</string>
|
||||
</resources>
|
||||
@ -1,7 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<!-- 應用資訊 -->
|
||||
<string name="app_name" translatable="false">EweSticker</string>
|
||||
<string name="pack_icon">套圖示</string>
|
||||
<string name="sticker_icon">貼圖示</string>
|
||||
<string name="close_sticker_preview">[點擊關閉貼圖預覽]</string>
|
||||
@ -72,4 +71,6 @@
|
||||
<string name="imported_033">E033: 一些貼圖未能導入（已導入 %1$d 個）。發現不受支援的格式</string>
|
||||
<string name="imported_034">E034: 重新載入貼圖失敗，請嘗試選擇貼圖來源目錄</string>
|
||||
<string name="fallback_041">E041: 在轉換貼圖時發生意外的 IOException</string>
|
||||
<!-- Keyboard -->
|
||||
<string name="sticker_pack_info">%1$s（包： %2$s）</string>
|
||||
</resources>
|
||||
@ -1,4 +1,4 @@
|
||||
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="PluralsCandidate">
|
||||
<resources>
|
||||
<!-- App info -->
|
||||
<string name="app_name" translatable="false">EweSticker</string>
|
||||
<string name="pack_icon">Pack icon</string>
|
||||
@ -57,7 +57,7 @@ Copyright © Randy Zhou</string>
|
||||
<string name="links_heading">Links</string>
|
||||
<string name="links_text">"- The source code for EweSticker is available at https://github.com/FredHappyface/Android.EweSticker
|
||||
|
||||
- The tutorials take you by the hand through a series of steps to get started using the software. Start here if you're new: https://github.com/FredHappyface/Android.EweSticker/blob/main/documentation/tutorials
|
||||
- The tutorials take you by the hand through a series of steps to get started using the software. Start here if you’re new: https://github.com/FredHappyface/Android.EweSticker/blob/main/documentation/tutorials
|
||||
|
||||
- The help guide provides a starting point and outlines common issues that you may have: https://github.com/FredHappyface/Android.EweSticker/blob/main/documentation/help
|
||||
|
||||
@ -72,4 +72,6 @@ Copyright © Randy Zhou</string>
|
||||
<string name="imported_033">E033: Some stickers failed to import (%1$d imported). Unsupported formats found</string>
|
||||
<string name="imported_034">E034: Reloading stickers failed, try choosing a sticker source directory</string>
|
||||
<string name="fallback_041">E041: Unexpected IOException when converting sticker</string>
|
||||
<!-- Keyboard -->
|
||||
<string name="sticker_pack_info">%1$s (Pack: %2$s)</string>
|
||||
</resources>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
plugins {
|
||||
id("com.android.application") version "8.1.0" apply false
|
||||
id("com.android.application") version "8.1.1" apply false
|
||||
id("org.jetbrains.kotlin.android") version "1.9.0" apply false
|
||||
id("org.jetbrains.dokka") version "1.8.20"
|
||||
id("org.jlleitschuh.gradle.ktlint") version "10.2.1"
|
||||
|
||||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
Loading…
x
Reference in New Issue
Block a user