New UI toolkit

.phrase.yml

@@ -1,22 +1,119 @@
+# Configuration for Android projects: https://help.phrase.com/help/examples
 phrase:
   project_id: 3e43b3f90cf19e83c7d85652df5766ca
-  file_format: strings
+  file_format: xml
   pull:
     targets:
+      # ui module
       - file: ./ui/src/main/res/values/strings.xml
-        params:
-          locale_id: b220db5757be359631c55ec54fb65ac6
-          encoding: "UTF-8"
-          file_format: xml
-          include_empty_translations: false
+        params: &defaults
+          locale_id: b220db5757be359631c55ec54fb65ac6 # en-US
+          fallback_locale_id: b220db5757be359631c55ec54fb65ac6 # en-US
+          tags: SDK,Coupons
+          include_empty_translations: true
           format_options:
             convert_placeholder: true
             escape_linebreaks: true
-      - file: ./ui/src/main/res/values-<locale_name>/strings.xml
+      - file: ./ui/src/main/res/values-de/strings.xml
         params:
-          encoding: "UTF-8"
-          file_format: xml
-          include_empty_translations: false
-          format_options:
-            convert_placeholder: true
-            escape_linebreaks: true
+          <<: *defaults
+          locale_id: 512f99f8cd03c80affd16303fb5de9c2 # de
+      - file: ./ui/src/main/res/values-fr/strings.xml
+        params:
+          <<: *defaults
+          locale_id: edf0b29dd998221329199f185d360ae4 # fr
+      - file: ./ui/src/main/res/values-fr-rCH/strings.xml
+        params:
+          <<: *defaults
+          locale_id: fae2e092d1704da2ed88f3f56eb6f219 # fr-CH
+      - file: ./ui/src/main/res/values-hu/strings.xml
+        params:
+          <<: *defaults
+          locale_id: 8f797bd77008e27f6286531a5ad55f67 # hu
+      - file: ./ui/src/main/res/values-it/strings.xml
+        params:
+          <<: *defaults
+          locale_id: a4dea5c3e2c77e7c6ea344e69db63ed9 # it
+      - file: ./ui/src/main/res/values-sk/strings.xml
+        params:
+          <<: *defaults
+          locale_id: 9ee4c528e480d56878c98ee8bfbc521b # sk
+
+      # ui-toolkit module
+      - file: ./ui-toolkit/src/debug/res/values/strings.xml
+        params:
+          <<: *defaults
+          locale_id: b220db5757be359631c55ec54fb65ac6 # en-US
+          tags: Sample
+      - file: ./ui-toolkit/src/main/res/values/strings.xml
+        params:
+          <<: *defaults
+          locale_id: b220db5757be359631c55ec54fb65ac6 # en-US
+          tags: Onboarding
+      - file: ./ui-toolkit/src/main/res/values-de/strings.xml
+        params:
+          <<: *defaults
+          locale_id: 512f99f8cd03c80affd16303fb5de9c2 # de
+          tags: Onboarding
+      - file: ./ui-toolkit/src/main/res/values-fr/strings.xml
+        params:
+          <<: *defaults
+          locale_id: edf0b29dd998221329199f185d360ae4 # fr
+          tags: Onboarding
+      - file: ./ui-toolkit/src/main/res/values-fr-rCH/strings.xml
+        params:
+          <<: *defaults
+          locale_id: fae2e092d1704da2ed88f3f56eb6f219 # fr-CH
+          tags: Onboarding
+      - file: ./ui-toolkit/src/main/res/values-hu/strings.xml
+        params:
+          <<: *defaults
+          locale_id: 8f797bd77008e27f6286531a5ad55f67 # hu
+          tags: Onboarding
+      - file: ./ui-toolkit/src/main/res/values-it/strings.xml
+        params:
+          <<: *defaults
+          locale_id: a4dea5c3e2c77e7c6ea344e69db63ed9 # it
+          tags: Onboarding
+      - file: ./ui-toolkit/src/main/res/values-sk/strings.xml
+        params:
+          <<: *defaults
+          locale_id: 9ee4c528e480d56878c98ee8bfbc521b # sk
+          tags: Onboarding
+
+      # kotlin-sample module
+      - file: ./kotlin-sample/src/main/res/values/strings.xml
+        params:
+          <<: *defaults
+          locale_id: b220db5757be359631c55ec54fb65ac6 # en-US
+          tags: Sample
+      - file: ./kotlin-sample/src/main/res/values-de/strings.xml
+        params:
+          <<: *defaults
+          locale_id: 512f99f8cd03c80affd16303fb5de9c2 # de
+          tags: Sample
+      - file: ./kotlin-sample/src/main/res/values-fr/strings.xml
+        params:
+          <<: *defaults
+          locale_id: edf0b29dd998221329199f185d360ae4 # fr
+          tags: Sample
+      - file: ./kotlin-sample/src/main/res/values-fr-rCH/strings.xml
+        params:
+          <<: *defaults
+          locale_id: fae2e092d1704da2ed88f3f56eb6f219 # fr-CH
+          tags: Sample
+      - file: ./kotlin-sample/src/main/res/values-hu/strings.xml
+        params:
+          <<: *defaults
+          locale_id: 8f797bd77008e27f6286531a5ad55f67 # hu
+          tags: Sample
+      - file: ./kotlin-sample/src/main/res/values-it/strings.xml
+        params:
+          <<: *defaults
+          locale_id: a4dea5c3e2c77e7c6ea344e69db63ed9 # it
+          tags: Sample
+      - file: ./kotlin-sample/src/main/res/values-sk/strings.xml
+        params:
+          <<: *defaults
+          locale_id: 9ee4c528e480d56878c98ee8bfbc521b # sk
+          tags: Sample

CHANGELOG.md

@@ -1,9 +1,18 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.69.0]
+
+### Changed
+- Added ui-toolkit for more realistic sample app with onboarding
+- Moved accessibility toolbox to an own dependency
+
+### Breaking Changes
+- Renamed some colors which should be only used internal only
+
 ## [0.68.6]
 
-# Changed
+### Changed
 - Apply new Phrase key structure
 
 ## [0.68.5]

accessibility-toolbox/.gitignore

@@ -0,0 +1 @@
+/build

accessibility-toolbox/build.gradle

@@ -0,0 +1,58 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply from: '../scripts/maven.gradle'
+apply plugin: 'org.jetbrains.dokka'
+apply plugin: "org.jetbrains.kotlin.plugin.parcelize"
+
+description = "Accessibility-Toolbox: Make it easy to make your app accessibile"
+
+android {
+    compileSdkVersion project.compileSdkVersion
+
+    defaultConfig {
+        minSdkVersion project.minSdkVersion
+        targetSdkVersion project.targetSdkVersion
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+    }
+
+    buildTypes {
+        release {
+            postprocessing {
+                removeUnusedCode false
+                removeUnusedResources false
+                obfuscate false
+                optimizeCode false
+                proguardFile 'proguard-rules.pro'
+            }
+        }
+    }
+
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    sourceSets {
+        getByName("main").java.srcDirs("src/main/kotlin")
+        getByName("test").java.srcDirs("src/test/kotlin")
+        getByName("androidTest").java.srcDirs("src/androidTest/kotlin")
+    }
+
+    kotlinOptions {
+        freeCompilerArgs = ['-Xjvm-default=all']
+        jvmTarget = '1.8'
+    }
+
+    lint {
+        disable 'LabelFor', 'MissingTranslation'
+    }
+}
+
+dependencies {
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${project.desugarVersion}"
+
+    implementation project(':utils')
+
+    implementation 'androidx.core:core-ktx:1.8.0'
+}

accessibility-toolbox/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

accessibility-toolbox/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="io.snabble.accessibility" />

ui/src/main/java/io/snabble/sdk/ui/AccessibilityToolBox.kt → accessibility-toolbox/src/main/kotlin/io/snabble/accessibility/AccessibilityToolBox.kt

@@ -1,4 +1,4 @@
-package io.snabble.sdk.ui
+package io.snabble.accessibility
 
 import android.accessibilityservice.AccessibilityServiceInfo
 import android.annotation.SuppressLint
@@ -15,7 +15,6 @@ import androidx.core.view.AccessibilityDelegateCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
 import androidx.core.view.isVisible
-import io.snabble.sdk.Snabble
 
 typealias AccessibilityEventListener = (host: ViewGroup?,
                                         child: View?,
@@ -47,18 +46,16 @@ class AccessibilityToolBox(private val target: View): AccessibilityDelegateCompa
     }
 
     override fun onRequestSendAccessibilityEvent(
-        host: ViewGroup?,
-        child: View?,
-        event: AccessibilityEvent?
+        host: ViewGroup,
+        child: View,
+        event: AccessibilityEvent
     ): Boolean {
-        val listener = event?.let { eventListeners[event.eventType] }
-        listener?.invoke(host, child, event)
+        eventListeners[event.eventType]?.invoke(host, child, event)
         return super.onRequestSendAccessibilityEvent(host, child, event)
     }
 
-    override fun onPopulateAccessibilityEvent(host: View, event: AccessibilityEvent?) {
-        val listener = event?.let { populateListeners[event.eventType] }
-        listener?.invoke(host.parent as? ViewGroup, host, event)
+    override fun onPopulateAccessibilityEvent(host: View, event: AccessibilityEvent) {
+        populateListeners[event.eventType]?.invoke(host.parent as? ViewGroup, host, event)
         super.onPopulateAccessibilityEvent(host, event)
     }
 
@@ -234,17 +231,4 @@ fun <T> Iterable<T>.forEachWindow(iterator: (last: T?, current: T, next: T?) ->
             }
         }
     }
-}
-
-object AccessibilityPreferences {
-    private const val KEY_SUPPRESS_SCANNER_HINT = "suppress_scanner_hint"
-    private val sharedPreferences = Snabble.application.getSharedPreferences("accessibility", Context.MODE_PRIVATE)
-    var suppressScannerHint: Boolean
-        get() = sharedPreferences.getBoolean(KEY_SUPPRESS_SCANNER_HINT, false)
-        set(seen) {
-            sharedPreferences
-                .edit()
-                .putBoolean(KEY_SUPPRESS_SCANNER_HINT, seen)
-                .apply()
-        }
 }

accessibility-toolbox/src/main/res/values/ids.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item type="id" name="snabble_accessibility_toolbox" />
+</resources>

build.gradle

@@ -14,9 +14,10 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-base:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         classpath 'gradle.plugin.com.github.jlouns:gradle-cross-platform-exec-plugin:0.5.0'
         classpath 'gradle.plugin.gmazzo:sqlite-plugin:0.2'
+        classpath 'com.github.bjoernq:unmockplugin:0.7.9'
     }
 }
 
@@ -40,7 +41,7 @@ allprojects {
         minSdkVersion=21
         targetSdkVersion=31
 
-        okhttpVersion='4.9.3'
+        okhttpVersion='4.10.0'
         desugarVersion='1.1.5'
 
         sdkVersion += project.getProperties().get('versionSuffix', '')

core/build.gradle

@@ -61,18 +61,18 @@ dependencies {
     implementation 'com.google.android.gms:play-services-wallet:19.1.0'
     implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'androidx.biometric:biometric:1.2.0-alpha04'
-    implementation 'androidx.lifecycle:lifecycle-process:2.4.1'
-    implementation 'androidx.lifecycle:lifecycle-common:2.4.1'
+    implementation 'androidx.lifecycle:lifecycle-process:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-common:2.5.1'
 
     api "com.squareup.okhttp3:okhttp:${project.okhttpVersion}"
     implementation "com.squareup.okhttp3:logging-interceptor:${project.okhttpVersion}"
     implementation 'eu.rekisoft.android.util:LazyWorker:2.1.0'
 
-    api 'com.google.code.gson:gson:2.9.0'
+    api 'com.google.code.gson:gson:2.9.1'
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.robolectric:robolectric:4.8.1'
     testImplementation "com.squareup.okhttp3:mockwebserver:${project.okhttpVersion}"
-    testImplementation 'org.jetbrains.kotlin:kotlin-reflect:1.6.21'
+    testImplementation "org.jetbrains.kotlin:kotlin-reflect:${project.kotlin_version}"
     testImplementation 'androidx.arch.core:core-testing:2.1.0'
 }

java-sample/build.gradle

@@ -71,7 +71,7 @@ dependencies {
 
     //noinspection GradleDependency
     implementation 'commons-io:commons-io:2.5'
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.google.android.material:material:1.6.1'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test:runner:1.4.0'

kotlin-compose-sample/src/main/res/values/themes.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <style name="AppTheme" parent="@style/Theme.Material3.DayNight.NoActionBar" />
 </resources>

kotlin-customization-sample/build.gradle

@@ -37,21 +37,23 @@ dependencies {
 
     implementation project(':core')
     implementation project(':ui')
+    // used for onboarding implementation
+    implementation project(':ui-toolkit')
 
     // in your app you need to use those dependencies:
     // implementation 'io.snabble.sdk:core:{currentVersion}'
     // implementation 'io.snabble.sdk:ui:{currentVersion}'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.core:core-ktx:1.8.0'
     implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.6.0'
+    implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.2'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.4.2'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.1'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.5.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.2'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.4.2'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.1'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.5.1'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'