From a317d027e300b2c2c44cfd59dde6c4136f8ed68e Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Thu, 19 Dec 2024 16:08:01 +0200 Subject: [PATCH 01/29] add AOSP dependencies as git submodules --- .gitmodules | 16 ++++++++++++++++ lib/platform_external_libphonenumber | 1 + lib/platform_frameworks_ex | 1 + lib/platform_frameworks_opt_vcard | 1 + lib/platform_packages_apps_PhoneCommon | 1 + 5 files changed, 20 insertions(+) create mode 100644 .gitmodules create mode 160000 lib/platform_external_libphonenumber create mode 160000 lib/platform_frameworks_ex create mode 160000 lib/platform_frameworks_opt_vcard create mode 160000 lib/platform_packages_apps_PhoneCommon diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..9c342a49f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,16 @@ +[submodule "lib/platform_external_libphonenumber"] + path = lib/platform_external_libphonenumber + url = https://github.com/GrapheneOS/platform_external_libphonenumber + branch = main +[submodule "lib/platform_frameworks_ex"] + path = lib/platform_frameworks_ex + url = https://github.com/GrapheneOS/platform_frameworks_ex + branch = main +[submodule "lib/platform_frameworks_opt_vcard"] + path = lib/platform_frameworks_opt_vcard + url = https://github.com/GrapheneOS/platform_frameworks_opt_vcard + branch = main +[submodule "lib/platform_packages_apps_PhoneCommon"] + path = lib/platform_packages_apps_PhoneCommon + url = https://github.com/GrapheneOS/platform_packages_apps_PhoneCommon + branch = main diff --git a/lib/platform_external_libphonenumber b/lib/platform_external_libphonenumber new file mode 160000 index 000000000..17c10656e --- /dev/null +++ b/lib/platform_external_libphonenumber @@ -0,0 +1 @@ +Subproject commit 17c10656ebd38235f36a762f2f362a8011028ada diff --git a/lib/platform_frameworks_ex b/lib/platform_frameworks_ex new file mode 160000 index 000000000..dbacb84fe --- /dev/null +++ b/lib/platform_frameworks_ex @@ -0,0 +1 @@ +Subproject commit dbacb84fe6e498775194b6e2cdc3e09d8ce25ab8 diff --git a/lib/platform_frameworks_opt_vcard b/lib/platform_frameworks_opt_vcard new file mode 160000 index 000000000..274080f62 --- /dev/null +++ b/lib/platform_frameworks_opt_vcard @@ -0,0 +1 @@ +Subproject commit 274080f626ebfee216f926c5a8e2a932cb2b01dd diff --git a/lib/platform_packages_apps_PhoneCommon b/lib/platform_packages_apps_PhoneCommon new file mode 160000 index 000000000..0f8bb7daa --- /dev/null +++ b/lib/platform_packages_apps_PhoneCommon @@ -0,0 +1 @@ +Subproject commit 0f8bb7daabecebdc56c2114f112ff229b17d19f1 From 8572783d51da7dbb8a7a0859b36c68eb8e496495 Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Thu, 19 Dec 2024 16:11:01 +0200 Subject: [PATCH 02/29] add Gradle build support --- .gitignore | 17 ++ .idea/.gitignore | 3 + .idea/compiler.xml | 6 + .idea/deploymentTargetSelector.xml | 10 + .idea/gradle.xml | 25 +++ .idea/kotlinc.xml | 6 + .idea/migrations.xml | 10 + .idea/misc.xml | 10 + .idea/runConfigurations.xml | 17 ++ .idea/vcs.xml | 15 ++ AndroidManifest.xml | 1 - app/.gitignore | 1 + app/build.gradle.kts | 52 +++++ build.gradle.kts | 4 + gradle.properties | 2 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 8 + gradlew | 252 +++++++++++++++++++++++ gradlew.bat | 94 +++++++++ settings.gradle.kts | 19 ++ 20 files changed, 551 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/deploymentTargetSelector.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/kotlinc.xml create mode 100644 .idea/migrations.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 .idea/vcs.xml create mode 100644 app/.gitignore create mode 100644 app/build.gradle.kts create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..1ca9b2546 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +/.idea/deploymentTargetDropDown.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +keystore.properties +*.keystore +local.properties diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..26d33521a --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 000000000..b589d56e9 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 000000000..b268ef36c --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 000000000..d7b4d00e2 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,25 @@ + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 000000000..c224ad564 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 000000000..f8051a6f9 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..3b0be2284 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 000000000..16660f1d8 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..77ec63edf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4cff3c527..761c93ef4 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -15,7 +15,6 @@ --> diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 000000000..796b96d1c --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 000000000..e1712ceb8 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,52 @@ +plugins { + id("com.android.application") + kotlin("android") +} + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + +android { + compileSdk = 35 + buildToolsVersion = "35.0.0" + + namespace = "com.android.contacts" + + defaultConfig { + minSdk = 34 + //noinspection OldTargetApi + targetSdk = 34 + } + + buildTypes { + getByName("debug") { + applicationIdSuffix = ".debug" + val selfPkgName = android.namespace + applicationIdSuffix + resValue("string", "applicationLabel", "Contacts d") + resValue("string", "contacts_file_provider_authority", "$selfPkgName.files") + resValue("string", "contacts_sdn_provider_authority", "$selfPkgName.sdn") + } + } + + sourceSets.getByName("main") { + manifest.srcFile("../AndroidManifest.xml") + java.srcDirs("../src", "../src-bind") + res.srcDir("../res") + } +} + +dependencies { + implementation("androidx.appcompat:appcompat:1.7.0") + implementation("androidx.palette:palette:1.0.0") + implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") + implementation("com.google.android.material:material:1.12.0") + implementation("com.google.guava:guava:33.4.0-android") + + implementation(project(":lib:platform_external_libphonenumber")) + implementation(project(":lib:platform_frameworks_ex:common")) + implementation(project(":lib:platform_frameworks_opt_vcard")) + implementation(project(":lib:platform_packages_apps_PhoneCommon")) +} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 000000000..c7ad7549e --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,4 @@ +plugins { + id("com.android.application") version "8.7.3" apply false + id("org.jetbrains.kotlin.android") version "2.0.21" apply false +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..3c5e11311 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +android.useAndroidX=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..fb602ee2a --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,8 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..f5feea6d6 --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..9d21a2183 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 000000000..6db34070c --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,19 @@ +pluginManagement { + repositories { + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +include(":app") +include(":lib:platform_external_libphonenumber") +include(":lib:platform_frameworks_ex:common") +include(":lib:platform_frameworks_opt_vcard") +include(":lib:platform_packages_apps_PhoneCommon") From 0bc5330fc076bd4435956f4248b2b64649429e48 Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Thu, 19 Dec 2024 16:16:18 +0200 Subject: [PATCH 03/29] fix androidx.appcompat resource references --- src/com/android/contacts/activities/ActionBarAdapter.java | 2 +- src/com/android/contacts/activities/ShowOrCreateActivity.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java index e6f29a4ab..8f1cd9ca3 100644 --- a/src/com/android/contacts/activities/ActionBarAdapter.java +++ b/src/com/android/contacts/activities/ActionBarAdapter.java @@ -441,7 +441,7 @@ public void run() { */ public void updateOverflowButtonColor() { final String overflowDescription = mActivity.getResources().getString( - R.string.abc_action_menu_overflow_description); + androidx.appcompat.R.string.abc_action_menu_overflow_description); final ViewGroup decorView = (ViewGroup) mActivity.getWindow().getDecorView(); final ViewTreeObserver viewTreeObserver = decorView.getViewTreeObserver(); viewTreeObserver.addOnGlobalLayoutListener( diff --git a/src/com/android/contacts/activities/ShowOrCreateActivity.java b/src/com/android/contacts/activities/ShowOrCreateActivity.java index 086565b83..c06813dea 100755 --- a/src/com/android/contacts/activities/ShowOrCreateActivity.java +++ b/src/com/android/contacts/activities/ShowOrCreateActivity.java @@ -219,7 +219,7 @@ protected Dialog onCreateDialog(int id) { final CharSequence message = getResources().getString( R.string.add_contact_dlg_message_fmt, mCreateDescrip); - return new AlertDialog.Builder(this, R.style.Theme_AppCompat_DayNight_Dialog_Alert) + return new AlertDialog.Builder(this, androidx.appcompat.R.style.Theme_AppCompat_DayNight_Dialog_Alert) .setMessage(message) .setPositiveButton(android.R.string.ok, new IntentClickListener(this, createIntent)) From 843b26ca3f91082be8fc92a598b94725d93eace3 Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Thu, 19 Dec 2024 16:19:51 +0200 Subject: [PATCH 04/29] inline SET_DEFAULT_ACCOUNT_FOR_CONTACTS permission system API constant --- .idea/inspectionProfiles/Project_Default.xml | 186 ++++++++++++++++++ src/com/android/contacts/SystemApis.java | 7 + .../preference/ContactsPreferences.java | 2 +- 3 files changed, 194 insertions(+), 1 deletion(-) create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 src/com/android/contacts/SystemApis.java diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 000000000..cbcb0e4c6 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,186 @@ + + + + \ No newline at end of file diff --git a/src/com/android/contacts/SystemApis.java b/src/com/android/contacts/SystemApis.java new file mode 100644 index 000000000..17106bfd5 --- /dev/null +++ b/src/com/android/contacts/SystemApis.java @@ -0,0 +1,7 @@ +package com.android.contacts; + +public class SystemApis { + // android.Manifest.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS + public static final String SET_DEFAULT_ACCOUNT_FOR_CONTACTS = + "android.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS"; +} diff --git a/src/com/android/contacts/preference/ContactsPreferences.java b/src/com/android/contacts/preference/ContactsPreferences.java index bd535e45b..a6891af88 100644 --- a/src/com/android/contacts/preference/ContactsPreferences.java +++ b/src/com/android/contacts/preference/ContactsPreferences.java @@ -16,7 +16,7 @@ package com.android.contacts.preference; -import static android.Manifest.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS; +import static com.android.contacts.SystemApis.SET_DEFAULT_ACCOUNT_FOR_CONTACTS; import android.accounts.Account; import android.app.backup.BackupManager; From eef36f1edd58f6f886287f328981073e1f653a50 Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Fri, 20 Dec 2024 19:35:22 +0200 Subject: [PATCH 05/29] add assets dir to Gradle sourceSets --- app/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e1712ceb8..8437ee75d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -32,6 +32,7 @@ android { } sourceSets.getByName("main") { + assets.srcDir("../assets") manifest.srcFile("../AndroidManifest.xml") java.srcDirs("../src", "../src-bind") res.srcDir("../res") From 352c581f0ea7dbd40483c5817211a147374be0ab Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Fri, 20 Dec 2024 19:45:33 +0200 Subject: [PATCH 06/29] update platform_external_libphonenumber --- lib/platform_external_libphonenumber | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/platform_external_libphonenumber b/lib/platform_external_libphonenumber index 17c10656e..4814ded38 160000 --- a/lib/platform_external_libphonenumber +++ b/lib/platform_external_libphonenumber @@ -1 +1 @@ -Subproject commit 17c10656ebd38235f36a762f2f362a8011028ada +Subproject commit 4814ded38ba34c69da1fcb949b9d47640d854c50 From a2d1a1db514ec8577d6a58f3a338c3b81741cbff Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Fri, 10 Apr 2026 15:51:43 +0300 Subject: [PATCH 07/29] Remove .idea from git --- .gitignore | 10 +++------- .idea/deploymentTargetSelector.xml | 10 ---------- .idea/gradle.xml | 25 ------------------------- .idea/misc.xml | 10 ---------- 4 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 .idea/deploymentTargetSelector.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/misc.xml diff --git a/.gitignore b/.gitignore index 1ca9b2546..16fe015c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,8 @@ .gradle /local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -/.idea/deploymentTargetDropDown.xml +/.idea/* +!/.idea/vcs.xml +/.kotlin .DS_Store /build /captures diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml deleted file mode 100644 index b268ef36c..000000000 --- a/.idea/deploymentTargetSelector.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index d7b4d00e2..000000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 3b0be2284..000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file From 9250aabe674a371b775ce54528dcf060ff8ed3bd Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Fri, 10 Apr 2026 16:04:06 +0300 Subject: [PATCH 08/29] Update Android SDK --- app/build.gradle.kts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8437ee75d..6ba4db38f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -10,15 +10,14 @@ java { } android { - compileSdk = 35 - buildToolsVersion = "35.0.0" + compileSdk = 36 + buildToolsVersion = "36.1.0" namespace = "com.android.contacts" defaultConfig { - minSdk = 34 - //noinspection OldTargetApi - targetSdk = 34 + minSdk = 36 + targetSdk = 36 } buildTypes { From e6d5ba3e4c9b3ade6f1dd889fee6d254f3cc9720 Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Fri, 10 Apr 2026 16:05:02 +0300 Subject: [PATCH 09/29] Remove system APIs calls from tests --- AndroidManifest.xml | 1 - src/com/android/contacts/SystemApis.java | 7 ---- .../contacts/editor/ContactEditorUtils.java | 10 ------ .../preference/ContactsPreferences.java | 34 ------------------- .../contacts/GroupsDaoIntegrationTests.java | 3 -- .../editor/ContactEditorUtilsTest.java | 4 +-- .../android/contacts/tests/AdbHelpers.java | 25 -------------- 7 files changed, 2 insertions(+), 82 deletions(-) delete mode 100644 src/com/android/contacts/SystemApis.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 761c93ef4..cd1f69807 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -45,7 +45,6 @@ - diff --git a/src/com/android/contacts/SystemApis.java b/src/com/android/contacts/SystemApis.java deleted file mode 100644 index 17106bfd5..000000000 --- a/src/com/android/contacts/SystemApis.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.android.contacts; - -public class SystemApis { - // android.Manifest.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS - public static final String SET_DEFAULT_ACCOUNT_FOR_CONTACTS = - "android.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS"; -} diff --git a/src/com/android/contacts/editor/ContactEditorUtils.java b/src/com/android/contacts/editor/ContactEditorUtils.java index 232c1e40b..d9cae0059 100644 --- a/src/com/android/contacts/editor/ContactEditorUtils.java +++ b/src/com/android/contacts/editor/ContactEditorUtils.java @@ -76,16 +76,6 @@ static Uri maybeConvertToLegacyLookupUri( return contactLookupUri; } - @VisibleForTesting - void cleanupForTest() { - mContactsPrefs.clearDefaultAccount(); - } - - @VisibleForTesting - void removeDefaultAccountForTest() { - mContactsPrefs.clearDefaultAccount(); - } - @VisibleForTesting void setDefaultAccountForTest(AccountWithDataSet account) { mContactsPrefs.setDefaultAccountForTest(account); diff --git a/src/com/android/contacts/preference/ContactsPreferences.java b/src/com/android/contacts/preference/ContactsPreferences.java index a6891af88..484ac3a6c 100644 --- a/src/com/android/contacts/preference/ContactsPreferences.java +++ b/src/com/android/contacts/preference/ContactsPreferences.java @@ -16,15 +16,12 @@ package com.android.contacts.preference; -import static com.android.contacts.SystemApis.SET_DEFAULT_ACCOUNT_FOR_CONTACTS; - import android.accounts.Account; import android.app.backup.BackupManager; import android.content.Context; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; -import android.content.pm.PackageManager; import android.os.Handler; import android.os.Looper; import android.os.StrictMode; @@ -251,37 +248,6 @@ private AccountWithDataSet getAccountWithDatasetFromDefaultAccountAndState( } } - private boolean hasSetDefaultAccountPermission() { - return mContext.checkSelfPermission(SET_DEFAULT_ACCOUNT_FOR_CONTACTS) - == PackageManager.PERMISSION_GRANTED; - } - - public void clearDefaultAccount() { - if (setDefaultAccountAndState(DefaultAccountAndState.ofNotSet())) { - mDefaultAccount = null; - } - } - - @VisibleForTesting - public boolean setDefaultAccountAndState(DefaultAccountAndState defaultAccountAndState) { - if (hasSetDefaultAccountPermission()) { - StrictMode.ThreadPolicy oldPolicy = StrictMode.getThreadPolicy(); - StrictMode.setThreadPolicy( - new StrictMode.ThreadPolicy.Builder(oldPolicy) - .permitDiskWrites() - .permitDiskReads() - .build()); - try { - DefaultAccount.setDefaultAccountForNewContacts( - mContext.getContentResolver(), defaultAccountAndState); - } finally { - StrictMode.setThreadPolicy(oldPolicy); - } - return true; - } - return false; - } - public void setDefaultAccountForTest(AccountWithDataSet account) { mDefaultAccount = account; } diff --git a/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java b/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java index 7546b3219..41a6b7286 100644 --- a/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java +++ b/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java @@ -34,8 +34,6 @@ import androidx.test.filters.MediumTest; import com.android.contacts.model.account.AccountWithDataSet; -import com.android.contacts.preference.ContactsPreferences; - import java.util.ArrayList; import java.util.List; @@ -52,7 +50,6 @@ protected void setUp() throws Exception { mTestRecords = new ArrayList<>(); mResolver = getContext().getContentResolver(); - new ContactsPreferences(getContext()).clearDefaultAccount(); } @Override diff --git a/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java b/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java index 898fc7b94..bee0cd238 100644 --- a/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java +++ b/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java @@ -66,7 +66,7 @@ public void setUp() throws Exception { mTarget = ContactEditorUtils.create(InstrumentationRegistry.getTargetContext()); // Clear the preferences. - mTarget.cleanupForTest(); + setDefaultAccountForTest(null); } /** @@ -193,7 +193,7 @@ public void testShouldShowAccountChangedNotification_initial_check() { Collections.singletonList(ACCOUNT_1_A))); // Remove the default account to emulate broken preferences. - mTarget.removeDefaultAccountForTest(); + setDefaultAccountForTest(null); // The dialog shouldn't show up. // The logic is, if there's a writable account, we'll pick it as default diff --git a/tests/src/com/android/contacts/tests/AdbHelpers.java b/tests/src/com/android/contacts/tests/AdbHelpers.java index 9936b9c78..9521fb82e 100644 --- a/tests/src/com/android/contacts/tests/AdbHelpers.java +++ b/tests/src/com/android/contacts/tests/AdbHelpers.java @@ -15,20 +15,17 @@ */ package com.android.contacts.tests; -import android.accounts.Account; import android.content.Context; import android.content.OperationApplicationException; import android.os.Build; import android.os.Bundle; import android.os.RemoteException; -import android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState; import android.util.Log; import androidx.annotation.RequiresApi; import androidx.test.InstrumentationRegistry; import com.android.contacts.model.account.AccountWithDataSet; -import com.android.contacts.preference.ContactsPreferences; import com.android.contacts.util.SharedPreferenceUtil; /** @@ -63,28 +60,6 @@ public static void removeTestAccount(Context context, Bundle args) { new AccountsTestHelper(context).removeTestAccount(account); } - public static void setDefaultAccount(Context context, Bundle args) { - final String name = args.getString("name"); - final String type = args.getString("type"); - - if (name == null || type == null) { - Log.e(TAG, "args must contain extras \"name\" and \"type\""); - return; - } - - AccountWithDataSet localDeviceAccount = AccountWithDataSet.getLocalAccount(context); - DefaultAccountAndState defaultAccountAndState = - name.equals(localDeviceAccount.name) && type.equals(localDeviceAccount.type) - ? DefaultAccountAndState.ofLocal() - : DefaultAccountAndState.ofCloud(new Account(name, type)); - - new ContactsPreferences(context).setDefaultAccountAndState(defaultAccountAndState); - } - - public static void clearDefaultAccount(Context context) { - new ContactsPreferences(context).clearDefaultAccount(); - } - public static void clearPreferences(Context context) { SharedPreferenceUtil.clear(context); } From 8bd1396861128df5107c617412639e336783b476 Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Fri, 10 Apr 2026 16:13:32 +0300 Subject: [PATCH 10/29] Migrate to version catalogs and Gradle KTS --- app/build.gradle.kts | 14 +++++++------- build.gradle.kts | 5 +++-- gradle/libs.versions.toml | 20 ++++++++++++++++++++ settings.gradle.kts | 1 + 4 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6ba4db38f..21bf6ae3e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("com.android.application") - kotlin("android") + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) } java { @@ -39,11 +39,11 @@ android { } dependencies { - implementation("androidx.appcompat:appcompat:1.7.0") - implementation("androidx.palette:palette:1.0.0") - implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") - implementation("com.google.android.material:material:1.12.0") - implementation("com.google.guava:guava:33.4.0-android") + implementation(libs.androidx.appcompat) + implementation(libs.androidx.palette) + implementation(libs.androidx.swiperefreshlayout) + implementation(libs.material) + implementation(libs.guava) implementation(project(":lib:platform_external_libphonenumber")) implementation(project(":lib:platform_frameworks_ex:common")) diff --git a/build.gradle.kts b/build.gradle.kts index c7ad7549e..119965d7c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,5 @@ plugins { - id("com.android.application") version "8.7.3" apply false - id("org.jetbrains.kotlin.android") version "2.0.21" apply false + alias(libs.plugins.android.application) apply false + alias(libs.plugins.android.library) apply false + alias(libs.plugins.kotlin.android) apply false } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 000000000..bab992704 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,20 @@ +[versions] +agp = "8.7.3" +kotlin = "2.0.21" +appcompat = "1.7.0" +guava = "33.4.0-android" +material = "1.12.0" +palette = "1.0.0" +swiperefreshlayout = "1.1.0" + +[libraries] +androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" } +androidx-palette = { module = "androidx.palette:palette", version.ref = "palette" } +androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" } +guava = { module = "com.google.guava:guava", version.ref = "guava" } +material = { module = "com.google.android.material:material", version.ref = "material" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +android-library = { id = "com.android.library", version.ref = "agp" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 6db34070c..f72ac91ab 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,6 @@ pluginManagement { repositories { + gradlePluginPortal() google() mavenCentral() } From d02638474b99e310b888a45ea168c6f99dc565cf Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Fri, 10 Apr 2026 16:26:38 +0300 Subject: [PATCH 11/29] Upgrade dependencies --- gradle/libs.versions.toml | 10 +++++----- .../android/contacts/editor/ContactEditorFragment.java | 2 +- .../contacts/list/CustomContactListFilterActivity.java | 4 ++-- src/com/android/contacts/model/AccountTypeManager.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bab992704..cf72163d0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,11 +1,11 @@ [versions] agp = "8.7.3" -kotlin = "2.0.21" -appcompat = "1.7.0" -guava = "33.4.0-android" -material = "1.12.0" +kotlin = "2.3.20" +appcompat = "1.7.1" +guava = "33.5.0-android" +material = "1.13.0" palette = "1.0.0" -swiperefreshlayout = "1.1.0" +swiperefreshlayout = "1.2.0" [libraries] androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" } diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java index d7d164f0a..f13777eb8 100755 --- a/src/com/android/contacts/editor/ContactEditorFragment.java +++ b/src/com/android/contacts/editor/ContactEditorFragment.java @@ -58,6 +58,7 @@ import android.widget.ListPopupWindow; import android.widget.Toast; +import androidx.annotation.Nullable; import androidx.appcompat.widget.Toolbar; import com.android.contacts.ContactSaveService; @@ -107,7 +108,6 @@ import java.util.Locale; import java.util.Set; -import javax.annotation.Nullable; /** Contact editor with only the most important fields displayed initially. */ public class ContactEditorFragment extends Fragment diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java index 7bb70d674..4be1b57df 100644 --- a/src/com/android/contacts/list/CustomContactListFilterActivity.java +++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java @@ -17,6 +17,8 @@ package com.android.contacts.list; import android.app.Activity; + +import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; @@ -80,8 +82,6 @@ import java.util.Iterator; import java.util.List; -import javax.annotation.Nullable; - /** * Shows a list of all available {@link Groups} available, letting the user * select which ones they want to be visible. diff --git a/src/com/android/contacts/model/AccountTypeManager.java b/src/com/android/contacts/model/AccountTypeManager.java index 8882d815a..d75c0193b 100644 --- a/src/com/android/contacts/model/AccountTypeManager.java +++ b/src/com/android/contacts/model/AccountTypeManager.java @@ -33,6 +33,7 @@ import android.text.TextUtils; import android.util.Log; +import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.localbroadcastmanager.content.LocalBroadcastManager; @@ -68,7 +69,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.Executor; -import javax.annotation.Nullable; /** * Singleton holder for all parsed {@link AccountType} available on the system, typically filled From 6b30384c0f5fd67532ecc79c846818e1f2cfe294 Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Fri, 10 Apr 2026 16:29:25 +0300 Subject: [PATCH 12/29] Upgrade gradle --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fb602ee2a..8e61ef125 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From be65fcaf3b4b3236be6ec2e0fe326f4500dd4e71 Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Fri, 10 Apr 2026 16:39:05 +0300 Subject: [PATCH 13/29] Upgrade AGP to 9.1.0 --- AndroidManifest.xml | 4 ---- app/build.gradle.kts | 13 +++++++++---- build.gradle.kts | 1 - gradle/libs.versions.toml | 4 +--- tests/AndroidManifest.xml | 2 -- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index cd1f69807..75ceec99e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -18,10 +18,6 @@ android:versionCode="10734" android:versionName="1.7.34"> - - + + android:launchMode="singleTop" + android:theme="@android:style/Theme.Material.Light.NoActionBar"> @@ -404,6 +405,13 @@ + + + + () + + private val capturedActions = mutableListOf() + + @Before + fun setup() { + capturedActions.clear() + } + + @Test + fun initialState_showsSaveButton() { + setContent() + composeTestRule.onNodeWithTag(TestTags.SAVE_BUTTON).assertIsDisplayed() + } + + @Test + fun initialState_showsBackButton() { + setContent() + composeTestRule.onNodeWithTag(TestTags.BACK_BUTTON).assertIsDisplayed() + } + + @Test + fun initialState_showsNameField() { + setContent() + composeTestRule.onNodeWithTag(TestTags.NAME_FIRST).assertIsDisplayed() + } + + @Test + fun initialState_showsPhoneField() { + setContent() + composeTestRule.onNodeWithTag(TestTags.phoneField(0)).assertIsDisplayed() + } + + @Test + fun initialState_showsEmailField() { + setContent() + composeTestRule.onNodeWithTag(TestTags.emailField(0)).assertIsDisplayed() + } + + @Test + fun initialState_showsAccountChip() { + setContent() + composeTestRule.onNodeWithTag(TestTags.ACCOUNT_CHIP).assertIsDisplayed() + } + + @Test + fun tapSave_dispatchesSaveAction() { + setContent() + composeTestRule.onNodeWithTag(TestTags.SAVE_BUTTON).performClick() + assertEquals(ContactCreationAction.Save, capturedActions.last()) + } + + @Test + fun tapBack_dispatchesNavigateBackAction() { + setContent() + composeTestRule.onNodeWithTag(TestTags.BACK_BUTTON).performClick() + assertEquals(ContactCreationAction.NavigateBack, capturedActions.last()) + } + + @Test + fun savingState_disablesSaveButton() { + setContent(state = ContactCreationUiState(isSaving = true)) + composeTestRule.onNodeWithTag(TestTags.SAVE_BUTTON).assertIsNotEnabled() + } + + @Test + fun notSavingState_enablesSaveButton() { + setContent(state = ContactCreationUiState(isSaving = false)) + composeTestRule.onNodeWithTag(TestTags.SAVE_BUTTON).assertIsEnabled() + } + + private fun setContent(state: ContactCreationUiState = ContactCreationUiState()) { + composeTestRule.setContent { + AppTheme { + ContactCreationEditorScreen( + uiState = state, + onAction = { capturedActions.add(it) }, + ) + } + } + } +} diff --git a/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/EmailSectionTest.kt b/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/EmailSectionTest.kt new file mode 100644 index 000000000..b67bf09a9 --- /dev/null +++ b/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/EmailSectionTest.kt @@ -0,0 +1,92 @@ +package com.android.contacts.ui.contactcreation.component + +import androidx.activity.ComponentActivity +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.junit4.createAndroidComposeRule +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.test.performClick +import androidx.compose.ui.test.performTextInput +import com.android.contacts.ui.contactcreation.TestTags +import com.android.contacts.ui.contactcreation.model.ContactCreationAction +import com.android.contacts.ui.contactcreation.model.EmailFieldState +import com.android.contacts.ui.core.AppTheme +import kotlin.test.assertIs +import org.junit.Assert.assertEquals +import org.junit.Before +import org.junit.Rule +import org.junit.Test + +class EmailSectionTest { + + @get:Rule + val composeTestRule = createAndroidComposeRule() + + private val capturedActions = mutableListOf() + + @Before + fun setup() { + capturedActions.clear() + } + + @Test + fun rendersEmailField() { + setContent() + composeTestRule.onNodeWithTag(TestTags.emailField(0)).assertIsDisplayed() + } + + @Test + fun rendersAddEmailButton() { + setContent() + composeTestRule.onNodeWithTag(TestTags.EMAIL_ADD).assertIsDisplayed() + } + + @Test + fun typeInEmail_dispatchesUpdateEmail() { + setContent() + composeTestRule.onNodeWithTag(TestTags.emailField(0)).performTextInput("a@b.com") + assertIs(capturedActions.last()) + } + + @Test + fun tapAddEmail_dispatchesAddEmailAction() { + setContent() + composeTestRule.onNodeWithTag(TestTags.EMAIL_ADD).performClick() + assertEquals(ContactCreationAction.AddEmail, capturedActions.last()) + } + + @Test + fun multipleEmails_showsDeleteButtons() { + val emails = listOf( + EmailFieldState(id = "1", address = "a@b.com"), + EmailFieldState(id = "2", address = "c@d.com"), + ) + setContent(emails = emails) + composeTestRule.onNodeWithTag(TestTags.emailDelete(0)).assertIsDisplayed() + composeTestRule.onNodeWithTag(TestTags.emailDelete(1)).assertIsDisplayed() + } + + @Test + fun tapDeleteEmail_dispatchesRemoveEmailAction() { + val emails = listOf( + EmailFieldState(id = "1", address = "a@b.com"), + EmailFieldState(id = "2", address = "c@d.com"), + ) + setContent(emails = emails) + composeTestRule.onNodeWithTag(TestTags.emailDelete(1)).performClick() + assertIs(capturedActions.last()) + } + + private fun setContent(emails: List = listOf(EmailFieldState())) { + composeTestRule.setContent { + AppTheme { + LazyColumn { + emailSection( + emails = emails, + onAction = { capturedActions.add(it) }, + ) + } + } + } + } +} diff --git a/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/NameSectionTest.kt b/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/NameSectionTest.kt new file mode 100644 index 000000000..e4b2f570c --- /dev/null +++ b/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/NameSectionTest.kt @@ -0,0 +1,68 @@ +package com.android.contacts.ui.contactcreation.component + +import androidx.activity.ComponentActivity +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.junit4.createAndroidComposeRule +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.test.performTextInput +import com.android.contacts.ui.contactcreation.TestTags +import com.android.contacts.ui.contactcreation.model.ContactCreationAction +import com.android.contacts.ui.contactcreation.model.NameState +import com.android.contacts.ui.core.AppTheme +import kotlin.test.assertIs +import org.junit.Before +import org.junit.Rule +import org.junit.Test + +class NameSectionTest { + + @get:Rule + val composeTestRule = createAndroidComposeRule() + + private val capturedActions = mutableListOf() + + @Before + fun setup() { + capturedActions.clear() + } + + @Test + fun rendersFirstNameField() { + setContent() + composeTestRule.onNodeWithTag(TestTags.NAME_FIRST).assertIsDisplayed() + } + + @Test + fun rendersLastNameField() { + setContent() + composeTestRule.onNodeWithTag(TestTags.NAME_LAST).assertIsDisplayed() + } + + @Test + fun typeFirstName_dispatchesUpdateFirstName() { + setContent() + composeTestRule.onNodeWithTag(TestTags.NAME_FIRST).performTextInput("John") + assertIs(capturedActions.last()) + } + + @Test + fun typeLastName_dispatchesUpdateLastName() { + setContent() + composeTestRule.onNodeWithTag(TestTags.NAME_LAST).performTextInput("Doe") + assertIs(capturedActions.last()) + } + + private fun setContent(nameState: NameState = NameState()) { + composeTestRule.setContent { + AppTheme { + LazyColumn { + nameSection( + nameState = nameState, + onAction = { capturedActions.add(it) }, + ) + } + } + } + } +} diff --git a/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/PhoneSectionTest.kt b/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/PhoneSectionTest.kt new file mode 100644 index 000000000..422313ac6 --- /dev/null +++ b/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/PhoneSectionTest.kt @@ -0,0 +1,92 @@ +package com.android.contacts.ui.contactcreation.component + +import androidx.activity.ComponentActivity +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.junit4.createAndroidComposeRule +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.test.performClick +import androidx.compose.ui.test.performTextInput +import com.android.contacts.ui.contactcreation.TestTags +import com.android.contacts.ui.contactcreation.model.ContactCreationAction +import com.android.contacts.ui.contactcreation.model.PhoneFieldState +import com.android.contacts.ui.core.AppTheme +import kotlin.test.assertIs +import org.junit.Assert.assertEquals +import org.junit.Before +import org.junit.Rule +import org.junit.Test + +class PhoneSectionTest { + + @get:Rule + val composeTestRule = createAndroidComposeRule() + + private val capturedActions = mutableListOf() + + @Before + fun setup() { + capturedActions.clear() + } + + @Test + fun rendersPhoneField() { + setContent() + composeTestRule.onNodeWithTag(TestTags.phoneField(0)).assertIsDisplayed() + } + + @Test + fun rendersAddPhoneButton() { + setContent() + composeTestRule.onNodeWithTag(TestTags.PHONE_ADD).assertIsDisplayed() + } + + @Test + fun typeInPhone_dispatchesUpdatePhone() { + setContent() + composeTestRule.onNodeWithTag(TestTags.phoneField(0)).performTextInput("555") + assertIs(capturedActions.last()) + } + + @Test + fun tapAddPhone_dispatchesAddPhoneAction() { + setContent() + composeTestRule.onNodeWithTag(TestTags.PHONE_ADD).performClick() + assertEquals(ContactCreationAction.AddPhone, capturedActions.last()) + } + + @Test + fun multiplePhones_showsDeleteButtons() { + val phones = listOf( + PhoneFieldState(id = "1", number = "111"), + PhoneFieldState(id = "2", number = "222"), + ) + setContent(phones = phones) + composeTestRule.onNodeWithTag(TestTags.phoneDelete(0)).assertIsDisplayed() + composeTestRule.onNodeWithTag(TestTags.phoneDelete(1)).assertIsDisplayed() + } + + @Test + fun tapDeletePhone_dispatchesRemovePhoneAction() { + val phones = listOf( + PhoneFieldState(id = "1", number = "111"), + PhoneFieldState(id = "2", number = "222"), + ) + setContent(phones = phones) + composeTestRule.onNodeWithTag(TestTags.phoneDelete(1)).performClick() + assertIs(capturedActions.last()) + } + + private fun setContent(phones: List = listOf(PhoneFieldState())) { + composeTestRule.setContent { + AppTheme { + LazyColumn { + phoneSection( + phones = phones, + onAction = { capturedActions.add(it) }, + ) + } + } + } + } +} diff --git a/app/src/test/java/com/android/contacts/test/MainDispatcherRule.kt b/app/src/test/java/com/android/contacts/test/MainDispatcherRule.kt new file mode 100644 index 000000000..226d83fa9 --- /dev/null +++ b/app/src/test/java/com/android/contacts/test/MainDispatcherRule.kt @@ -0,0 +1,22 @@ +package com.android.contacts.test + +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.TestDispatcher +import kotlinx.coroutines.test.UnconfinedTestDispatcher +import kotlinx.coroutines.test.resetMain +import kotlinx.coroutines.test.setMain +import org.junit.rules.TestWatcher +import org.junit.runner.Description + +@OptIn(ExperimentalCoroutinesApi::class) +class MainDispatcherRule(val testDispatcher: TestDispatcher = UnconfinedTestDispatcher()) : + TestWatcher() { + override fun starting(description: Description) { + Dispatchers.setMain(testDispatcher) + } + + override fun finished(description: Description) { + Dispatchers.resetMain() + } +} diff --git a/app/src/test/java/com/android/contacts/ui/contactcreation/ContactCreationViewModelTest.kt b/app/src/test/java/com/android/contacts/ui/contactcreation/ContactCreationViewModelTest.kt new file mode 100644 index 000000000..5d4a7a83c --- /dev/null +++ b/app/src/test/java/com/android/contacts/ui/contactcreation/ContactCreationViewModelTest.kt @@ -0,0 +1,210 @@ +package com.android.contacts.ui.contactcreation + +import android.net.Uri +import androidx.lifecycle.SavedStateHandle +import app.cash.turbine.test +import com.android.contacts.test.MainDispatcherRule +import com.android.contacts.ui.contactcreation.delegate.ContactFieldsDelegate +import com.android.contacts.ui.contactcreation.mapper.RawContactDeltaMapper +import com.android.contacts.ui.contactcreation.model.ContactCreationAction +import com.android.contacts.ui.contactcreation.model.ContactCreationEffect +import com.android.contacts.ui.contactcreation.model.ContactCreationUiState +import com.android.contacts.ui.contactcreation.model.NameState +import com.android.contacts.ui.contactcreation.model.PhoneFieldState +import kotlin.test.assertIs +import kotlinx.coroutines.test.runTest +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner + +@RunWith(RobolectricTestRunner::class) +class ContactCreationViewModelTest { + + @get:Rule + val mainDispatcherRule = MainDispatcherRule() + + @Test + fun initialState_isDefault() { + val vm = createViewModel() + val state = vm.uiState.value + assertEquals(NameState(), state.nameState) + assertEquals(1, state.phoneNumbers.size) + assertEquals(1, state.emails.size) + assertFalse(state.isSaving) + } + + @Test + fun updateFirstName_updatesState() { + val vm = createViewModel() + vm.onAction(ContactCreationAction.UpdateFirstName("John")) + assertEquals("John", vm.uiState.value.nameState.first) + } + + @Test + fun updateLastName_updatesState() { + val vm = createViewModel() + vm.onAction(ContactCreationAction.UpdateLastName("Doe")) + assertEquals("Doe", vm.uiState.value.nameState.last) + } + + @Test + fun addPhone_addsRow() { + val vm = createViewModel() + val initialCount = vm.uiState.value.phoneNumbers.size + vm.onAction(ContactCreationAction.AddPhone) + assertEquals(initialCount + 1, vm.uiState.value.phoneNumbers.size) + } + + @Test + fun removePhone_removesRow() { + val vm = createViewModel() + vm.onAction(ContactCreationAction.AddPhone) + val id = vm.uiState.value.phoneNumbers[0].id + vm.onAction(ContactCreationAction.RemovePhone(id)) + assertEquals(1, vm.uiState.value.phoneNumbers.size) + assertTrue(vm.uiState.value.phoneNumbers.none { it.id == id }) + } + + @Test + fun updatePhone_updatesValue() { + val vm = createViewModel() + val id = vm.uiState.value.phoneNumbers[0].id + vm.onAction(ContactCreationAction.UpdatePhone(id, "555-1234")) + assertEquals("555-1234", vm.uiState.value.phoneNumbers[0].number) + } + + @Test + fun addEmail_addsRow() { + val vm = createViewModel() + val initialCount = vm.uiState.value.emails.size + vm.onAction(ContactCreationAction.AddEmail) + assertEquals(initialCount + 1, vm.uiState.value.emails.size) + } + + @Test + fun saveAction_withPendingChanges_emitsSaveEffect() = + runTest(mainDispatcherRule.testDispatcher) { + val vm = createViewModel() + vm.onAction(ContactCreationAction.UpdateFirstName("John")) + + vm.effects.test { + vm.onAction(ContactCreationAction.Save) + assertIs(awaitItem()) + cancelAndIgnoreRemainingEvents() + } + } + + @Test + fun saveAction_withNoChanges_doesNotEmitSaveEffect() = + runTest(mainDispatcherRule.testDispatcher) { + val vm = createViewModel() + vm.effects.test { + vm.onAction(ContactCreationAction.Save) + expectNoEvents() + } + } + + @Test + fun navigateBack_withNoChanges_emitsNavigateBack() = + runTest(mainDispatcherRule.testDispatcher) { + val vm = createViewModel() + vm.effects.test { + vm.onAction(ContactCreationAction.NavigateBack) + assertIs(awaitItem()) + cancelAndIgnoreRemainingEvents() + } + } + + @Test + fun navigateBack_withChanges_emitsDiscardDialog() = + runTest(mainDispatcherRule.testDispatcher) { + val vm = createViewModel() + vm.onAction(ContactCreationAction.UpdateFirstName("John")) + + vm.effects.test { + vm.onAction(ContactCreationAction.NavigateBack) + assertIs(awaitItem()) + cancelAndIgnoreRemainingEvents() + } + } + + @Test + fun confirmDiscard_emitsNavigateBack() = + runTest(mainDispatcherRule.testDispatcher) { + val vm = createViewModel() + vm.effects.test { + vm.onAction(ContactCreationAction.ConfirmDiscard) + assertIs(awaitItem()) + cancelAndIgnoreRemainingEvents() + } + } + + @Test + fun onSaveResult_success_emitsSaveSuccess() = + runTest(mainDispatcherRule.testDispatcher) { + val vm = createViewModel() + val uri = Uri.parse("content://contacts/1") + + vm.effects.test { + vm.onSaveResult(true, uri) + val effect = awaitItem() + assertIs(effect) + assertEquals(uri, effect.contactUri) + cancelAndIgnoreRemainingEvents() + } + } + + @Test + fun onSaveResult_failure_emitsShowError() = + runTest(mainDispatcherRule.testDispatcher) { + val vm = createViewModel() + + vm.effects.test { + vm.onSaveResult(false, null) + assertIs(awaitItem()) + cancelAndIgnoreRemainingEvents() + } + } + + @Test + fun processDeathRestore_preservesState() { + val savedState = ContactCreationUiState( + nameState = NameState(first = "Saved"), + phoneNumbers = listOf(PhoneFieldState(number = "555")), + ) + val vm = createViewModel(initialState = savedState) + assertEquals("Saved", vm.uiState.value.nameState.first) + assertEquals("555", vm.uiState.value.phoneNumbers[0].number) + } + + @Test + fun saveAction_setsIsSaving() = + runTest(mainDispatcherRule.testDispatcher) { + val vm = createViewModel() + vm.onAction(ContactCreationAction.UpdateFirstName("John")) + vm.effects.test { + vm.onAction(ContactCreationAction.Save) + awaitItem() // Save effect + assertTrue(vm.uiState.value.isSaving) + cancelAndIgnoreRemainingEvents() + } + } + + private fun createViewModel( + initialState: ContactCreationUiState = ContactCreationUiState(), + ): ContactCreationViewModel { + val savedStateHandle = SavedStateHandle( + mapOf(ContactCreationViewModel.STATE_KEY to initialState), + ) + return ContactCreationViewModel( + savedStateHandle = savedStateHandle, + fieldsDelegate = ContactFieldsDelegate(), + deltaMapper = RawContactDeltaMapper(), + defaultDispatcher = mainDispatcherRule.testDispatcher, + ) + } +} diff --git a/app/src/test/java/com/android/contacts/ui/contactcreation/delegate/ContactFieldsDelegateTest.kt b/app/src/test/java/com/android/contacts/ui/contactcreation/delegate/ContactFieldsDelegateTest.kt new file mode 100644 index 000000000..40616894e --- /dev/null +++ b/app/src/test/java/com/android/contacts/ui/contactcreation/delegate/ContactFieldsDelegateTest.kt @@ -0,0 +1,112 @@ +package com.android.contacts.ui.contactcreation.delegate + +import com.android.contacts.ui.contactcreation.component.PhoneType +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test + +class ContactFieldsDelegateTest { + + private lateinit var delegate: ContactFieldsDelegate + + @Before + fun setup() { + delegate = ContactFieldsDelegate() + } + + // --- Phone --- + + @Test + fun initialState_hasOneEmptyPhone() { + val phones = delegate.getPhones() + assertEquals(1, phones.size) + assertTrue(phones[0].number.isEmpty()) + } + + @Test + fun addPhone_addsEmptyRow() { + val phones = delegate.addPhone() + assertEquals(2, phones.size) + assertTrue(phones[1].number.isEmpty()) + } + + @Test + fun removePhone_removesById() { + delegate.addPhone() + val phones = delegate.getPhones() + assertEquals(2, phones.size) + val idToRemove = phones[0].id + + val result = delegate.removePhone(idToRemove) + assertEquals(1, result.size) + assertTrue(result.none { it.id == idToRemove }) + } + + @Test + fun updatePhone_updatesValueById() { + val id = delegate.getPhones()[0].id + val result = delegate.updatePhone(id, "555-1234") + assertEquals("555-1234", result[0].number) + } + + @Test + fun updatePhone_nonExistentId_noChange() { + val result = delegate.updatePhone("nonexistent", "555") + assertEquals(1, result.size) + assertTrue(result[0].number.isEmpty()) + } + + @Test + fun updatePhoneType_changesTypeInState() { + val id = delegate.getPhones()[0].id + val result = delegate.updatePhoneType(id, PhoneType.Work) + assertEquals(PhoneType.Work, result[0].type) + } + + // --- Email --- + + @Test + fun initialState_hasOneEmptyEmail() { + val emails = delegate.getEmails() + assertEquals(1, emails.size) + assertTrue(emails[0].address.isEmpty()) + } + + @Test + fun addEmail_addsEmptyRow() { + val emails = delegate.addEmail() + assertEquals(2, emails.size) + } + + @Test + fun removeEmail_removesById() { + delegate.addEmail() + val id = delegate.getEmails()[0].id + val result = delegate.removeEmail(id) + assertEquals(1, result.size) + assertTrue(result.none { it.id == id }) + } + + @Test + fun updateEmail_updatesValueById() { + val id = delegate.getEmails()[0].id + val result = delegate.updateEmail(id, "a@b.com") + assertEquals("a@b.com", result[0].address) + } + + // --- Restore --- + + @Test + fun restorePhones_replacesInternalState() { + val id = delegate.getPhones()[0].id + delegate.updatePhone(id, "old") + + val newPhones = listOf( + com.android.contacts.ui.contactcreation.model.PhoneFieldState(number = "restored"), + ) + delegate.restorePhones(newPhones) + + assertEquals("restored", delegate.getPhones()[0].number) + } +} diff --git a/app/src/test/java/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapperTest.kt b/app/src/test/java/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapperTest.kt new file mode 100644 index 000000000..ab4b802d9 --- /dev/null +++ b/app/src/test/java/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapperTest.kt @@ -0,0 +1,193 @@ +package com.android.contacts.ui.contactcreation.mapper + +import android.provider.ContactsContract.CommonDataKinds.Email +import android.provider.ContactsContract.CommonDataKinds.Phone +import android.provider.ContactsContract.CommonDataKinds.StructuredName +import com.android.contacts.ui.contactcreation.component.EmailType +import com.android.contacts.ui.contactcreation.component.PhoneType +import com.android.contacts.ui.contactcreation.model.ContactCreationUiState +import com.android.contacts.ui.contactcreation.model.EmailFieldState +import com.android.contacts.ui.contactcreation.model.NameState +import com.android.contacts.ui.contactcreation.model.PhoneFieldState +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner + +@RunWith(RobolectricTestRunner::class) +class RawContactDeltaMapperTest { + + private val mapper = RawContactDeltaMapper() + + @Test + fun mapsName_toStructuredNameDelta() { + val state = ContactCreationUiState( + nameState = NameState(first = "John", last = "Doe"), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(StructuredName.CONTENT_ITEM_TYPE) + + assertNotNull(entries) + assertEquals(1, entries!!.size) + assertEquals("John", entries[0].getAsString(StructuredName.GIVEN_NAME)) + assertEquals("Doe", entries[0].getAsString(StructuredName.FAMILY_NAME)) + } + + @Test + fun mapsFullName_withAllFields() { + val state = ContactCreationUiState( + nameState = NameState( + prefix = "Dr", + first = "John", + middle = "M", + last = "Doe", + suffix = "Jr", + ), + ) + val result = mapper.map(state, account = null) + val entry = result.state[0].getMimeEntries(StructuredName.CONTENT_ITEM_TYPE)!![0] + + assertEquals("Dr", entry.getAsString(StructuredName.PREFIX)) + assertEquals("John", entry.getAsString(StructuredName.GIVEN_NAME)) + assertEquals("M", entry.getAsString(StructuredName.MIDDLE_NAME)) + assertEquals("Doe", entry.getAsString(StructuredName.FAMILY_NAME)) + assertEquals("Jr", entry.getAsString(StructuredName.SUFFIX)) + } + + @Test + fun emptyName_notIncluded() { + val state = ContactCreationUiState( + nameState = NameState(), + phoneNumbers = listOf(PhoneFieldState(number = "555")), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(StructuredName.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun mapsPhone_toPhoneDelta() { + val state = ContactCreationUiState( + phoneNumbers = listOf(PhoneFieldState(number = "555-1234", type = PhoneType.Mobile)), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Phone.CONTENT_ITEM_TYPE) + + assertNotNull(entries) + assertEquals(1, entries!!.size) + assertEquals("555-1234", entries[0].getAsString(Phone.NUMBER)) + assertEquals(Phone.TYPE_MOBILE, entries[0].getAsInteger(Phone.TYPE)) + } + + @Test + fun emptyPhone_notIncluded() { + val state = ContactCreationUiState( + phoneNumbers = listOf(PhoneFieldState(number = "")), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Phone.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun multiplePhones_producesMultipleEntries() { + val state = ContactCreationUiState( + phoneNumbers = listOf( + PhoneFieldState(number = "111"), + PhoneFieldState(number = "222"), + ), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Phone.CONTENT_ITEM_TYPE) + + assertEquals(2, entries!!.size) + } + + @Test + fun customPhoneType_setsBothTypeAndLabel() { + val state = ContactCreationUiState( + phoneNumbers = listOf( + PhoneFieldState(number = "555", type = PhoneType.Custom("Satellite")), + ), + ) + val result = mapper.map(state, account = null) + val entry = result.state[0].getMimeEntries(Phone.CONTENT_ITEM_TYPE)!![0] + + assertEquals(Phone.TYPE_CUSTOM, entry.getAsInteger(Phone.TYPE)) + assertEquals("Satellite", entry.getAsString(Phone.LABEL)) + } + + @Test + fun mapsEmail_toEmailDelta() { + val state = ContactCreationUiState( + emails = listOf(EmailFieldState(address = "john@example.com", type = EmailType.Home)), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Email.CONTENT_ITEM_TYPE) + + assertNotNull(entries) + assertEquals(1, entries!!.size) + assertEquals("john@example.com", entries[0].getAsString(Email.DATA)) + assertEquals(Email.TYPE_HOME, entries[0].getAsInteger(Email.TYPE)) + } + + @Test + fun emptyEmail_notIncluded() { + val state = ContactCreationUiState( + emails = listOf(EmailFieldState(address = "")), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Email.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun customEmailType_setsBothTypeAndLabel() { + val state = ContactCreationUiState( + emails = listOf( + EmailFieldState(address = "a@b.com", type = EmailType.Custom("VIP")), + ), + ) + val result = mapper.map(state, account = null) + val entry = result.state[0].getMimeEntries(Email.CONTENT_ITEM_TYPE)!![0] + + assertEquals(Email.TYPE_CUSTOM, entry.getAsInteger(Email.TYPE)) + assertEquals("VIP", entry.getAsString(Email.LABEL)) + } + + @Test + fun nullAccount_setsLocalAccount() { + val state = ContactCreationUiState( + nameState = NameState(first = "Test"), + ) + val result = mapper.map(state, account = null) + + // Local account has null account name and type + assertNull(result.state[0].values.getAsString("account_name")) + } + + @Test + fun mixedEmptyAndFilledFields_onlyMapsFilledOnes() { + val state = ContactCreationUiState( + phoneNumbers = listOf( + PhoneFieldState(number = ""), + PhoneFieldState(number = "555"), + PhoneFieldState(number = " "), + ), + emails = listOf( + EmailFieldState(address = ""), + EmailFieldState(address = "a@b.com"), + ), + ) + val result = mapper.map(state, account = null) + + assertEquals(1, result.state[0].getMimeEntries(Phone.CONTENT_ITEM_TYPE)!!.size) + assertEquals(1, result.state[0].getMimeEntries(Email.CONTENT_ITEM_TYPE)!!.size) + } +} diff --git a/app/src/test/resources/robolectric.properties b/app/src/test/resources/robolectric.properties new file mode 100644 index 000000000..3f67ea5ac --- /dev/null +++ b/app/src/test/resources/robolectric.properties @@ -0,0 +1 @@ +sdk=35 diff --git a/build.gradle.kts b/build.gradle.kts index 1e673e6ff..11198da13 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,6 +5,7 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.hilt) apply false alias(libs.plugins.kotlin.compose) apply false + alias(libs.plugins.kotlin.parcelize) apply false alias(libs.plugins.ksp) apply false alias(libs.plugins.android.library) apply false alias(libs.plugins.ktlint) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c9754de41..ef2b661e9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,6 +8,9 @@ ktlint = "1.8.0" ktlint-gradle = "14.2.0" activity-compose = "1.13.0" +coil = "3.2.0" +collections-immutable = "0.3.8" +hilt-navigation-compose = "1.3.0" appcompat = "1.7.1" compose-bom = "2026.03.01" coroutines = "1.10.2" @@ -40,15 +43,20 @@ androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-mani androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } +androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "hilt-navigation-compose" } + androidx-palette = { module = "androidx.palette:palette", version.ref = "palette" } androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" } +coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" } + guava = { module = "com.google.guava:guava", version.ref = "guava" } hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" } hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt" } hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" } +kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "collections-immutable" } kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" } kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } @@ -77,5 +85,6 @@ detekt = { id = "dev.detekt", version.ref = "detekt" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint-gradle" } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index e1cb53437..77be903dd 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -10,19 +10,23 @@ + + + + @@ -34,9 +38,11 @@ + + @@ -45,44 +51,53 @@ + + + + + + + + + @@ -91,14 +106,17 @@ + + + @@ -107,9 +125,11 @@ + + @@ -118,9 +138,11 @@ + + @@ -129,14 +151,17 @@ + + + @@ -145,14 +170,17 @@ + + + @@ -161,9 +189,11 @@ + + @@ -172,9 +202,11 @@ + + @@ -183,29 +215,35 @@ + + + + + + @@ -214,9 +252,11 @@ + + @@ -225,19 +265,23 @@ + + + + @@ -249,14 +293,17 @@ + + + @@ -268,14 +315,17 @@ + + + @@ -287,14 +337,17 @@ + + + @@ -306,14 +359,17 @@ + + + @@ -325,14 +381,17 @@ + + + @@ -344,22 +403,27 @@ + + + + + @@ -368,22 +432,27 @@ + + + + + @@ -392,14 +461,17 @@ + + + @@ -411,17 +483,25 @@ + + + + + + + + @@ -430,14 +510,17 @@ + + + @@ -449,14 +532,17 @@ + + + @@ -468,14 +554,17 @@ + + + @@ -487,14 +576,17 @@ + + + @@ -506,14 +598,17 @@ + + + @@ -522,14 +617,17 @@ + + + @@ -541,14 +639,17 @@ + + + @@ -560,14 +661,17 @@ + + + @@ -576,9 +680,11 @@ + + @@ -587,14 +693,17 @@ + + + @@ -606,14 +715,17 @@ + + + @@ -625,14 +737,17 @@ + + + @@ -641,14 +756,17 @@ + + + @@ -657,14 +775,17 @@ + + + @@ -676,14 +797,17 @@ + + + @@ -692,14 +816,17 @@ + + + @@ -708,9 +835,11 @@ + + @@ -719,9 +848,11 @@ + + @@ -730,17 +861,21 @@ + + + + @@ -752,9 +887,11 @@ + + @@ -763,14 +900,17 @@ + + + @@ -782,14 +922,17 @@ + + + @@ -798,9 +941,11 @@ + + @@ -809,9 +954,11 @@ + + @@ -820,9 +967,11 @@ + + @@ -831,9 +980,11 @@ + + @@ -842,9 +993,11 @@ + + @@ -853,9 +1006,11 @@ + + @@ -864,22 +1019,27 @@ + + + + + @@ -888,9 +1048,11 @@ + + @@ -899,14 +1061,17 @@ + + + @@ -915,19 +1080,23 @@ + + + + @@ -936,14 +1105,25 @@ + + + + + + + + + + + @@ -952,9 +1132,11 @@ + + @@ -963,14 +1145,17 @@ + + + @@ -979,61 +1164,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1042,9 +1264,11 @@ + + @@ -1053,47 +1277,57 @@ + + + + + + + + + + @@ -1102,9 +1336,11 @@ + + @@ -1113,19 +1349,23 @@ + + + + @@ -1134,29 +1374,35 @@ + + + + + + @@ -1165,19 +1411,23 @@ + + + + @@ -1189,14 +1439,17 @@ + + + @@ -1205,27 +1458,33 @@ + + + + + + @@ -1234,14 +1493,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1250,29 +1535,35 @@ + + + + + + @@ -1284,9 +1575,11 @@ + + @@ -1295,17 +1588,21 @@ + + + + @@ -1314,14 +1611,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1333,14 +1672,17 @@ + + + @@ -1352,9 +1694,11 @@ + + @@ -1363,22 +1707,27 @@ + + + + + @@ -1390,17 +1739,28 @@ + + + + + + + + + + + @@ -1409,29 +1769,45 @@ + + + + + + + + + + + + + + + + @@ -1443,22 +1819,39 @@ + + + + + + + + + + + + + + + + + @@ -1467,14 +1860,25 @@ + + + + + + + + + + + @@ -1483,14 +1887,25 @@ + + + + + + + + + + + @@ -1499,9 +1914,11 @@ + + @@ -1510,9 +1927,11 @@ + + @@ -1521,9 +1940,11 @@ + + @@ -1532,9 +1953,11 @@ + + @@ -1543,9 +1966,11 @@ + + @@ -1554,9 +1979,11 @@ + + @@ -1565,9 +1992,11 @@ + + @@ -1576,9 +2005,11 @@ + + @@ -1587,14 +2018,17 @@ + + + @@ -1603,9 +2037,11 @@ + + @@ -1614,9 +2050,11 @@ + + @@ -1625,9 +2063,11 @@ + + @@ -1636,9 +2076,11 @@ + + @@ -1647,9 +2089,11 @@ + + @@ -1658,9 +2102,11 @@ + + @@ -1669,9 +2115,11 @@ + + @@ -1680,9 +2128,11 @@ + + @@ -1691,9 +2141,11 @@ + + @@ -1705,14 +2157,17 @@ + + + @@ -1724,14 +2179,17 @@ + + + @@ -1740,30 +2198,37 @@ + + + + + + + @@ -1775,9 +2240,11 @@ + + @@ -1786,9 +2253,11 @@ + + @@ -1797,14 +2266,17 @@ + + + @@ -1813,14 +2285,17 @@ + + + @@ -1829,9 +2304,11 @@ + + @@ -1840,9 +2317,11 @@ + + @@ -1851,17 +2330,21 @@ + + + + @@ -1870,9 +2353,11 @@ + + @@ -1881,9 +2366,11 @@ + + @@ -1892,9 +2379,11 @@ + + @@ -1903,9 +2392,11 @@ + + @@ -1914,9 +2405,11 @@ + + @@ -1925,9 +2418,11 @@ + + @@ -1936,9 +2431,11 @@ + + @@ -1947,9 +2444,11 @@ + + @@ -1958,9 +2457,11 @@ + + @@ -1969,9 +2470,11 @@ + + @@ -1980,9 +2483,11 @@ + + @@ -1991,9 +2496,11 @@ + + @@ -2002,9 +2509,11 @@ + + @@ -2013,9 +2522,11 @@ + + @@ -2024,17 +2535,21 @@ + + + + @@ -2043,9 +2558,11 @@ + + @@ -2054,9 +2571,11 @@ + + @@ -2065,9 +2584,11 @@ + + @@ -2076,9 +2597,11 @@ + + @@ -2087,9 +2610,11 @@ + + @@ -2098,9 +2623,11 @@ + + @@ -2109,9 +2636,11 @@ + + @@ -2120,41 +2649,51 @@ + + + + + + + + + + @@ -2163,41 +2702,51 @@ + + + + + + + + + + @@ -2206,9 +2755,11 @@ + + @@ -2217,145 +2768,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2364,96 +2951,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2465,9 +3083,11 @@ + + @@ -2476,19 +3096,23 @@ + + + + @@ -2500,17 +3124,21 @@ + + + + @@ -2519,40 +3147,49 @@ + + + + + + + + + @@ -2561,9 +3198,11 @@ + + @@ -2572,17 +3211,21 @@ + + + + @@ -2594,33 +3237,41 @@ + + + + + + + + @@ -2632,9 +3283,11 @@ + + @@ -2643,9 +3296,11 @@ + + @@ -2657,17 +3312,21 @@ + + + + @@ -2679,40 +3338,49 @@ + + + + + + + + + @@ -2721,9 +3389,11 @@ + + @@ -2732,9 +3402,11 @@ + + @@ -2743,9 +3415,11 @@ + + @@ -2757,27 +3431,33 @@ + + + + + + @@ -2786,17 +3466,21 @@ + + + + @@ -2808,39 +3492,47 @@ + + + + + + + + @@ -2849,30 +3541,37 @@ + + + + + + + @@ -2881,9 +3580,11 @@ + + @@ -2895,25 +3596,31 @@ + + + + + + @@ -2922,27 +3629,33 @@ + + + + + + @@ -2958,6 +3671,7 @@ + @@ -2968,22 +3682,27 @@ + + + + + @@ -2992,9 +3711,11 @@ + + @@ -3006,9 +3727,11 @@ + + @@ -3017,34 +3740,41 @@ + + + + + + + @@ -3053,30 +3783,37 @@ + + + + + + + @@ -3085,106 +3822,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3193,9 +3955,11 @@ + + @@ -3207,9 +3971,11 @@ + + @@ -3221,9 +3987,11 @@ + + @@ -3235,129 +4003,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3366,9 +4166,11 @@ + + @@ -3377,27 +4179,46 @@ + + + + + + + + + + + + + + + + + + + @@ -3406,29 +4227,35 @@ + + + + + + @@ -3437,14 +4264,17 @@ + + + @@ -3453,9 +4283,11 @@ + + @@ -3464,9 +4296,11 @@ + + @@ -3475,33 +4309,41 @@ + + + + + + + + @@ -3510,211 +4352,263 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3723,206 +4617,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3931,9 +4926,11 @@ + + @@ -3942,22 +4939,27 @@ + + + + + @@ -3966,14 +4968,17 @@ + + + @@ -3982,9 +4987,11 @@ + + @@ -3993,227 +5000,283 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4222,9 +5285,11 @@ + + @@ -4236,9 +5301,11 @@ + + @@ -4247,14 +5314,17 @@ + + + @@ -4266,9 +5336,11 @@ + + @@ -4280,9 +5352,11 @@ + + @@ -4294,9 +5368,11 @@ + + @@ -4308,9 +5384,11 @@ + + @@ -4322,19 +5400,23 @@ + + + + @@ -4343,9 +5425,11 @@ + + @@ -4354,17 +5438,21 @@ + + + + @@ -4373,9 +5461,11 @@ + + @@ -4384,39 +5474,47 @@ + + + + + + + + @@ -4425,9 +5523,11 @@ + + @@ -4436,29 +5536,35 @@ + + + + + + @@ -4467,42 +5573,51 @@ + + + + + + + + + @@ -4511,9 +5626,11 @@ + + @@ -4522,9 +5639,11 @@ + + @@ -4533,9 +5652,11 @@ + + @@ -4544,9 +5665,11 @@ + + @@ -4555,9 +5678,11 @@ + + @@ -4569,9 +5694,11 @@ + + @@ -4580,38 +5707,47 @@ + + + + + + + + + @@ -4620,53 +5756,65 @@ + + + + + + + + + + + + @@ -4678,42 +5826,51 @@ + + + + + + + + + @@ -4722,9 +5879,11 @@ + + @@ -4733,9 +5892,11 @@ + + @@ -4747,9 +5908,11 @@ + + @@ -4761,59 +5924,73 @@ + + + + + + + + + + + + + + @@ -4822,9 +5999,11 @@ + + @@ -4836,9 +6015,11 @@ + + @@ -4850,12 +6031,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4863,9 +6186,11 @@ + + @@ -4874,9 +6199,11 @@ + + @@ -4885,20 +6212,24 @@ + + + + @@ -4907,22 +6238,26 @@ + + + + @@ -4931,9 +6266,11 @@ + + @@ -4942,57 +6279,71 @@ + + + + + + + + + + + + + + @@ -5001,17 +6352,21 @@ + + + + @@ -5020,25 +6375,31 @@ + + + + + + @@ -5047,12 +6408,14 @@ + + @@ -5061,9 +6424,11 @@ + + @@ -5072,12 +6437,14 @@ + + @@ -5086,9 +6453,11 @@ + + @@ -5097,17 +6466,21 @@ + + + + @@ -5116,17 +6489,21 @@ + + + + @@ -5135,33 +6512,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -5173,9 +6574,11 @@ + + @@ -5184,81 +6587,101 @@ + + + + + + + + + + + + + + + + + + + + @@ -5267,9 +6690,11 @@ + + @@ -5278,50 +6703,61 @@ + + + + + + + + + + + @@ -5330,17 +6766,21 @@ + + + + @@ -5349,17 +6789,21 @@ + + + + @@ -5368,17 +6812,21 @@ + + + + @@ -5387,28 +6835,42 @@ + + + + + + + + + + + + + + @@ -5417,9 +6879,11 @@ + + @@ -5428,9 +6892,11 @@ + + @@ -5439,43 +6905,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5486,11 +6979,13 @@ + + @@ -5501,26 +6996,31 @@ + + + + + @@ -5529,38 +7029,47 @@ + + + + + + + + + @@ -5569,14 +7078,17 @@ + + + @@ -5585,32 +7097,39 @@ + + + + + + + @@ -5619,9 +7138,11 @@ + + @@ -5630,14 +7151,17 @@ + + + @@ -5646,9 +7170,11 @@ + + @@ -5657,14 +7183,17 @@ + + + @@ -5676,9 +7205,11 @@ + + @@ -5687,6 +7218,7 @@ + @@ -5695,6 +7227,7 @@ + @@ -5703,6 +7236,7 @@ + @@ -5711,9 +7245,11 @@ + + @@ -5725,19 +7261,23 @@ + + + + @@ -5749,9 +7289,11 @@ + + @@ -5760,17 +7302,21 @@ + + + + @@ -5779,14 +7325,17 @@ + + + @@ -5798,9 +7347,11 @@ + + @@ -5809,9 +7360,11 @@ + + @@ -5823,9 +7376,11 @@ + + @@ -5834,17 +7389,21 @@ + + + + @@ -5853,49 +7412,61 @@ + + + + + + + + + + + + @@ -5907,49 +7478,61 @@ + + + + + + + + + + + + @@ -5961,17 +7544,21 @@ + + + + @@ -5980,50 +7567,61 @@ + + + + + + + + + + + @@ -6032,9 +7630,11 @@ + + @@ -6046,9 +7646,11 @@ + + diff --git a/src/com/android/contacts/ui/contactcreation/ContactCreationActivity.kt b/src/com/android/contacts/ui/contactcreation/ContactCreationActivity.kt new file mode 100644 index 000000000..4aa4024e2 --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/ContactCreationActivity.kt @@ -0,0 +1,89 @@ +package com.android.contacts.ui.contactcreation + +import android.content.Intent +import android.os.Bundle +import android.provider.ContactsContract.Intents.Insert +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.activity.viewModels +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import com.android.contacts.ui.core.AppTheme +import dagger.hilt.android.AndroidEntryPoint + +@AndroidEntryPoint +internal class ContactCreationActivity : ComponentActivity() { + + private val viewModel: ContactCreationViewModel by viewModels() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + + if (savedInstanceState == null) { + val extras = sanitizeExtras(intent) + applyIntentExtras(extras) + } + + setContent { + AppTheme { + val uiState by viewModel.uiState.collectAsState() + ContactCreationEditorScreen( + uiState = uiState, + onAction = viewModel::onAction, + ) + } + } + } + + override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) + if (intent.action == ContactCreationViewModel.SAVE_COMPLETED_ACTION) { + val success = intent.data != null + viewModel.onSaveResult(success, intent.data) + } + } + + private fun applyIntentExtras(extras: SanitizedExtras) { + extras.name?.let { + viewModel.onAction( + com.android.contacts.ui.contactcreation.model.ContactCreationAction.UpdateFirstName( + it + ), + ) + } + extras.phone?.let { + viewModel.onAction( + com.android.contacts.ui.contactcreation.model.ContactCreationAction.UpdatePhone( + id = viewModel.uiState.value.phoneNumbers.first().id, + value = it, + ), + ) + } + extras.email?.let { + viewModel.onAction( + com.android.contacts.ui.contactcreation.model.ContactCreationAction.UpdateEmail( + id = viewModel.uiState.value.emails.first().id, + value = it, + ), + ) + } + } + + private fun sanitizeExtras(intent: Intent): SanitizedExtras { + return SanitizedExtras( + name = intent.getStringExtra(Insert.NAME)?.take(MAX_NAME_LEN), + phone = intent.getStringExtra(Insert.PHONE)?.take(MAX_PHONE_LEN), + email = intent.getStringExtra(Insert.EMAIL)?.take(MAX_EMAIL_LEN), + ) + } + + private data class SanitizedExtras(val name: String?, val phone: String?, val email: String?) + + private companion object { + const val MAX_NAME_LEN = 500 + const val MAX_PHONE_LEN = 100 + const val MAX_EMAIL_LEN = 320 + } +} diff --git a/src/com/android/contacts/ui/contactcreation/ContactCreationEditorScreen.kt b/src/com/android/contacts/ui/contactcreation/ContactCreationEditorScreen.kt new file mode 100644 index 000000000..5e9385365 --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/ContactCreationEditorScreen.kt @@ -0,0 +1,84 @@ +@file:OptIn(ExperimentalMaterial3Api::class) + +package com.android.contacts.ui.contactcreation + +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.filled.Check +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.LargeTopAppBar +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.platform.testTag +import com.android.contacts.ui.contactcreation.component.accountChipItem +import com.android.contacts.ui.contactcreation.component.emailSection +import com.android.contacts.ui.contactcreation.component.nameSection +import com.android.contacts.ui.contactcreation.component.phoneSection +import com.android.contacts.ui.contactcreation.model.ContactCreationAction +import com.android.contacts.ui.contactcreation.model.ContactCreationUiState + +@Composable +internal fun ContactCreationEditorScreen( + uiState: ContactCreationUiState, + onAction: (ContactCreationAction) -> Unit, + modifier: Modifier = Modifier, +) { + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + + Scaffold( + modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + topBar = { + LargeTopAppBar( + title = { Text("Create contact") }, + navigationIcon = { + IconButton( + onClick = { onAction(ContactCreationAction.NavigateBack) }, + modifier = Modifier.testTag(TestTags.BACK_BUTTON), + ) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back") + } + }, + actions = { + IconButton( + onClick = { onAction(ContactCreationAction.Save) }, + modifier = Modifier.testTag(TestTags.SAVE_BUTTON), + enabled = !uiState.isSaving, + ) { + Icon(Icons.Filled.Check, contentDescription = "Save") + } + }, + scrollBehavior = scrollBehavior, + ) + }, + ) { contentPadding -> + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = contentPadding, + ) { + accountChipItem( + accountName = uiState.accountName, + onAction = onAction, + ) + nameSection( + nameState = uiState.nameState, + onAction = onAction, + ) + phoneSection( + phones = uiState.phoneNumbers, + onAction = onAction, + ) + emailSection( + emails = uiState.emails, + onAction = onAction, + ) + } + } +} diff --git a/src/com/android/contacts/ui/contactcreation/ContactCreationViewModel.kt b/src/com/android/contacts/ui/contactcreation/ContactCreationViewModel.kt new file mode 100644 index 000000000..ad0ced745 --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/ContactCreationViewModel.kt @@ -0,0 +1,173 @@ +package com.android.contacts.ui.contactcreation + +import android.net.Uri +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.android.contacts.R +import com.android.contacts.di.core.DefaultDispatcher +import com.android.contacts.ui.contactcreation.delegate.ContactFieldsDelegate +import com.android.contacts.ui.contactcreation.mapper.RawContactDeltaMapper +import com.android.contacts.ui.contactcreation.model.ContactCreationAction +import com.android.contacts.ui.contactcreation.model.ContactCreationEffect +import com.android.contacts.ui.contactcreation.model.ContactCreationUiState +import com.android.contacts.ui.contactcreation.model.NameState +import dagger.hilt.android.lifecycle.HiltViewModel +import javax.inject.Inject +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.channels.Channel +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.receiveAsFlow +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch + +@HiltViewModel +internal class ContactCreationViewModel @Inject constructor( + private val savedStateHandle: SavedStateHandle, + private val fieldsDelegate: ContactFieldsDelegate, + private val deltaMapper: RawContactDeltaMapper, + @DefaultDispatcher private val defaultDispatcher: CoroutineDispatcher, +) : ViewModel() { + + private val _uiState = MutableStateFlow( + savedStateHandle.get(STATE_KEY) ?: ContactCreationUiState(), + ) + val uiState: StateFlow = _uiState.asStateFlow() + + val nameState: StateFlow = _uiState + .map { it.nameState } + .distinctUntilChanged() + .stateIn(viewModelScope, SharingStarted.WhileSubscribed(STOP_TIMEOUT), NameState()) + + private val _effects = Channel(Channel.BUFFERED) + val effects: Flow = _effects.receiveAsFlow() + + init { + val restored = savedStateHandle.get(STATE_KEY) + if (restored != null) { + fieldsDelegate.restorePhones(restored.phoneNumbers) + fieldsDelegate.restoreEmails(restored.emails) + } + viewModelScope.launch { + _uiState.collect { savedStateHandle[STATE_KEY] = it } + } + } + + @Suppress("CyclomaticComplexMethod") + fun onAction(action: ContactCreationAction) { + when (action) { + is ContactCreationAction.NavigateBack -> handleBack() + is ContactCreationAction.Save -> save() + is ContactCreationAction.ConfirmDiscard -> confirmDiscard() + + // Name + is ContactCreationAction.UpdatePrefix -> updateName { copy(prefix = action.value) } + is ContactCreationAction.UpdateFirstName -> updateName { copy(first = action.value) } + is ContactCreationAction.UpdateMiddleName -> updateName { copy(middle = action.value) } + is ContactCreationAction.UpdateLastName -> updateName { copy(last = action.value) } + is ContactCreationAction.UpdateSuffix -> updateName { copy(suffix = action.value) } + + // Phone + is ContactCreationAction.AddPhone -> + updateState { copy(phoneNumbers = fieldsDelegate.addPhone()) } + is ContactCreationAction.RemovePhone -> + updateState { copy(phoneNumbers = fieldsDelegate.removePhone(action.id)) } + is ContactCreationAction.UpdatePhone -> + updateState { + copy(phoneNumbers = fieldsDelegate.updatePhone(action.id, action.value)) + } + is ContactCreationAction.UpdatePhoneType -> + updateState { + copy(phoneNumbers = fieldsDelegate.updatePhoneType(action.id, action.type)) + } + + // Email + is ContactCreationAction.AddEmail -> + updateState { copy(emails = fieldsDelegate.addEmail()) } + is ContactCreationAction.RemoveEmail -> + updateState { copy(emails = fieldsDelegate.removeEmail(action.id)) } + is ContactCreationAction.UpdateEmail -> + updateState { copy(emails = fieldsDelegate.updateEmail(action.id, action.value)) } + is ContactCreationAction.UpdateEmailType -> + updateState { + copy(emails = fieldsDelegate.updateEmailType(action.id, action.type)) + } + + // Photo + is ContactCreationAction.SetPhoto -> + updateState { copy(photoUri = action.uri) } + is ContactCreationAction.RemovePhoto -> + updateState { copy(photoUri = null) } + + // Account + is ContactCreationAction.SelectAccount -> + updateState { + copy( + selectedAccount = action.account, + accountName = action.account.name, + ) + } + } + } + + fun onSaveResult(success: Boolean, contactUri: Uri?) { + viewModelScope.launch { + updateState { copy(isSaving = false) } + if (success) { + _effects.send(ContactCreationEffect.SaveSuccess(contactUri)) + } else { + _effects.send(ContactCreationEffect.ShowError(R.string.contactSavedErrorToast)) + } + } + } + + private fun save() { + val state = _uiState.value + if (!state.hasPendingChanges()) return + + viewModelScope.launch(defaultDispatcher) { + updateState { copy(isSaving = true) } + val result = deltaMapper.map(state, state.selectedAccount) + _effects.send(ContactCreationEffect.Save(result)) + } + } + + private fun handleBack() { + viewModelScope.launch { + if (_uiState.value.hasPendingChanges()) { + _effects.send(ContactCreationEffect.ShowDiscardDialog) + } else { + _effects.send(ContactCreationEffect.NavigateBack) + } + } + } + + private fun confirmDiscard() { + viewModelScope.launch { + _effects.send(ContactCreationEffect.NavigateBack) + } + } + + private inline fun updateName(crossinline transform: NameState.() -> NameState) { + _uiState.update { it.copy(nameState = it.nameState.transform()) } + } + + private inline fun updateState( + crossinline transform: ContactCreationUiState.() -> ContactCreationUiState, + ) { + _uiState.update { it.transform() } + } + + internal companion object { + const val STATE_KEY = "state" + const val SAVE_COMPLETED_ACTION = "com.android.contacts.SAVE_COMPLETED" + private const val STOP_TIMEOUT = 5_000L + } +} diff --git a/src/com/android/contacts/ui/contactcreation/TestTags.kt b/src/com/android/contacts/ui/contactcreation/TestTags.kt new file mode 100644 index 000000000..a6e4ab589 --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/TestTags.kt @@ -0,0 +1,32 @@ +package com.android.contacts.ui.contactcreation + +internal object TestTags { + // Top-level + const val SAVE_BUTTON = "contact_creation_save_button" + const val BACK_BUTTON = "contact_creation_back_button" + + // Name section + const val NAME_PREFIX = "contact_creation_name_prefix" + const val NAME_FIRST = "contact_creation_name_first" + const val NAME_MIDDLE = "contact_creation_name_middle" + const val NAME_LAST = "contact_creation_name_last" + const val NAME_SUFFIX = "contact_creation_name_suffix" + + // Phone section + const val PHONE_ADD = "contact_creation_phone_add" + fun phoneField(index: Int): String = "contact_creation_phone_field_$index" + fun phoneDelete(index: Int): String = "contact_creation_phone_delete_$index" + fun phoneType(index: Int): String = "contact_creation_phone_type_$index" + + // Email section + const val EMAIL_ADD = "contact_creation_email_add" + fun emailField(index: Int): String = "contact_creation_email_field_$index" + fun emailDelete(index: Int): String = "contact_creation_email_delete_$index" + fun emailType(index: Int): String = "contact_creation_email_type_$index" + + // Account + const val ACCOUNT_CHIP = "contact_creation_account_chip" + + // Photo + const val PHOTO_AVATAR = "contact_creation_photo_avatar" +} diff --git a/src/com/android/contacts/ui/contactcreation/component/AccountChip.kt b/src/com/android/contacts/ui/contactcreation/component/AccountChip.kt new file mode 100644 index 000000000..2532aab5d --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/component/AccountChip.kt @@ -0,0 +1,39 @@ +package com.android.contacts.ui.contactcreation.component + +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyListScope +import androidx.compose.material3.AssistChip +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.unit.dp +import com.android.contacts.ui.contactcreation.TestTags +import com.android.contacts.ui.contactcreation.model.ContactCreationAction + +internal fun LazyListScope.accountChipItem( + accountName: String?, + @Suppress("UNUSED_PARAMETER") onAction: (ContactCreationAction) -> Unit, +) { + item(key = "account_chip", contentType = "account_chip") { + AccountChip( + accountName = accountName, + onClick = { /* Phase 2: account picker sheet */ }, + ) + } +} + +@Composable +internal fun AccountChip( + accountName: String?, + onClick: () -> Unit, + modifier: Modifier = Modifier, +) { + AssistChip( + onClick = onClick, + label = { Text(accountName ?: "Device") }, + modifier = modifier + .padding(horizontal = 16.dp) + .testTag(TestTags.ACCOUNT_CHIP), + ) +} diff --git a/src/com/android/contacts/ui/contactcreation/component/EmailSection.kt b/src/com/android/contacts/ui/contactcreation/component/EmailSection.kt new file mode 100644 index 000000000..a5f6aa79b --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/component/EmailSection.kt @@ -0,0 +1,85 @@ +package com.android.contacts.ui.contactcreation.component + +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyListScope +import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.Close +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.unit.dp +import com.android.contacts.ui.contactcreation.TestTags +import com.android.contacts.ui.contactcreation.model.ContactCreationAction +import com.android.contacts.ui.contactcreation.model.EmailFieldState + +internal fun LazyListScope.emailSection( + emails: List, + onAction: (ContactCreationAction) -> Unit, +) { + itemsIndexed( + items = emails, + key = { _, item -> item.id }, + contentType = { _, _ -> "email_field" }, + ) { index, email -> + EmailFieldRow( + email = email, + index = index, + showDelete = emails.size > 1, + onAction = onAction, + modifier = Modifier.animateItem(), + ) + } + item(key = "email_add", contentType = "email_add") { + TextButton( + onClick = { onAction(ContactCreationAction.AddEmail) }, + modifier = Modifier + .padding(start = 16.dp) + .testTag(TestTags.EMAIL_ADD), + ) { + Icon(Icons.Filled.Add, contentDescription = null) + Text("Add email") + } + } +} + +@Composable +internal fun EmailFieldRow( + email: EmailFieldState, + index: Int, + showDelete: Boolean, + onAction: (ContactCreationAction) -> Unit, + modifier: Modifier = Modifier, +) { + Row( + modifier = modifier.padding(horizontal = 16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + OutlinedTextField( + value = email.address, + onValueChange = { onAction(ContactCreationAction.UpdateEmail(email.id, it)) }, + label = { Text("Email") }, + modifier = Modifier + .weight(1f) + .testTag(TestTags.emailField(index)), + singleLine = true, + ) + if (showDelete) { + IconButton( + onClick = { onAction(ContactCreationAction.RemoveEmail(email.id)) }, + modifier = Modifier.testTag(TestTags.emailDelete(index)), + ) { + Icon(Icons.Filled.Close, contentDescription = "Remove email") + } + } + } +} diff --git a/src/com/android/contacts/ui/contactcreation/component/FieldType.kt b/src/com/android/contacts/ui/contactcreation/component/FieldType.kt new file mode 100644 index 000000000..5a611c981 --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/component/FieldType.kt @@ -0,0 +1,52 @@ +package com.android.contacts.ui.contactcreation.component + +import android.os.Parcelable +import android.provider.ContactsContract.CommonDataKinds.Email +import android.provider.ContactsContract.CommonDataKinds.Phone +import kotlinx.parcelize.Parcelize + +@Parcelize +internal sealed class PhoneType : Parcelable { + data object Mobile : PhoneType() + data object Home : PhoneType() + data object Work : PhoneType() + data object WorkMobile : PhoneType() + data object Main : PhoneType() + data object FaxWork : PhoneType() + data object FaxHome : PhoneType() + data object Pager : PhoneType() + data object Other : PhoneType() + data class Custom(val label: String) : PhoneType() + + val rawValue: Int + get() = when (this) { + is Mobile -> Phone.TYPE_MOBILE + is Home -> Phone.TYPE_HOME + is Work -> Phone.TYPE_WORK + is WorkMobile -> Phone.TYPE_WORK_MOBILE + is Main -> Phone.TYPE_MAIN + is FaxWork -> Phone.TYPE_FAX_WORK + is FaxHome -> Phone.TYPE_FAX_HOME + is Pager -> Phone.TYPE_PAGER + is Other -> Phone.TYPE_OTHER + is Custom -> Phone.TYPE_CUSTOM + } +} + +@Parcelize +internal sealed class EmailType : Parcelable { + data object Home : EmailType() + data object Work : EmailType() + data object Other : EmailType() + data object Mobile : EmailType() + data class Custom(val label: String) : EmailType() + + val rawValue: Int + get() = when (this) { + is Home -> Email.TYPE_HOME + is Work -> Email.TYPE_WORK + is Other -> Email.TYPE_OTHER + is Mobile -> Email.TYPE_MOBILE + is Custom -> Email.TYPE_CUSTOM + } +} diff --git a/src/com/android/contacts/ui/contactcreation/component/NameSection.kt b/src/com/android/contacts/ui/contactcreation/component/NameSection.kt new file mode 100644 index 000000000..6df8dc555 --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/component/NameSection.kt @@ -0,0 +1,52 @@ +package com.android.contacts.ui.contactcreation.component + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyListScope +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.unit.dp +import com.android.contacts.ui.contactcreation.TestTags +import com.android.contacts.ui.contactcreation.model.ContactCreationAction +import com.android.contacts.ui.contactcreation.model.NameState + +internal fun LazyListScope.nameSection( + nameState: NameState, + onAction: (ContactCreationAction) -> Unit, +) { + item(key = "name_section", contentType = "name_section") { + NameFields(nameState = nameState, onAction = onAction) + } +} + +@Composable +internal fun NameFields( + nameState: NameState, + onAction: (ContactCreationAction) -> Unit, + modifier: Modifier = Modifier, +) { + Column(modifier = modifier.padding(horizontal = 16.dp)) { + OutlinedTextField( + value = nameState.first, + onValueChange = { onAction(ContactCreationAction.UpdateFirstName(it)) }, + label = { Text("First name") }, + modifier = Modifier + .fillMaxWidth() + .testTag(TestTags.NAME_FIRST), + singleLine = true, + ) + OutlinedTextField( + value = nameState.last, + onValueChange = { onAction(ContactCreationAction.UpdateLastName(it)) }, + label = { Text("Last name") }, + modifier = Modifier + .fillMaxWidth() + .testTag(TestTags.NAME_LAST), + singleLine = true, + ) + } +} diff --git a/src/com/android/contacts/ui/contactcreation/component/PhoneSection.kt b/src/com/android/contacts/ui/contactcreation/component/PhoneSection.kt new file mode 100644 index 000000000..0abe4666c --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/component/PhoneSection.kt @@ -0,0 +1,85 @@ +package com.android.contacts.ui.contactcreation.component + +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyListScope +import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.Close +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.unit.dp +import com.android.contacts.ui.contactcreation.TestTags +import com.android.contacts.ui.contactcreation.model.ContactCreationAction +import com.android.contacts.ui.contactcreation.model.PhoneFieldState + +internal fun LazyListScope.phoneSection( + phones: List, + onAction: (ContactCreationAction) -> Unit, +) { + itemsIndexed( + items = phones, + key = { _, item -> item.id }, + contentType = { _, _ -> "phone_field" }, + ) { index, phone -> + PhoneFieldRow( + phone = phone, + index = index, + showDelete = phones.size > 1, + onAction = onAction, + modifier = Modifier.animateItem(), + ) + } + item(key = "phone_add", contentType = "phone_add") { + TextButton( + onClick = { onAction(ContactCreationAction.AddPhone) }, + modifier = Modifier + .padding(start = 16.dp) + .testTag(TestTags.PHONE_ADD), + ) { + Icon(Icons.Filled.Add, contentDescription = null) + Text("Add phone") + } + } +} + +@Composable +internal fun PhoneFieldRow( + phone: PhoneFieldState, + index: Int, + showDelete: Boolean, + onAction: (ContactCreationAction) -> Unit, + modifier: Modifier = Modifier, +) { + Row( + modifier = modifier.padding(horizontal = 16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + OutlinedTextField( + value = phone.number, + onValueChange = { onAction(ContactCreationAction.UpdatePhone(phone.id, it)) }, + label = { Text("Phone") }, + modifier = Modifier + .weight(1f) + .testTag(TestTags.phoneField(index)), + singleLine = true, + ) + if (showDelete) { + IconButton( + onClick = { onAction(ContactCreationAction.RemovePhone(phone.id)) }, + modifier = Modifier.testTag(TestTags.phoneDelete(index)), + ) { + Icon(Icons.Filled.Close, contentDescription = "Remove phone") + } + } + } +} diff --git a/src/com/android/contacts/ui/contactcreation/delegate/ContactFieldsDelegate.kt b/src/com/android/contacts/ui/contactcreation/delegate/ContactFieldsDelegate.kt new file mode 100644 index 000000000..394f04f42 --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/delegate/ContactFieldsDelegate.kt @@ -0,0 +1,69 @@ +package com.android.contacts.ui.contactcreation.delegate + +import com.android.contacts.ui.contactcreation.component.EmailType +import com.android.contacts.ui.contactcreation.component.PhoneType +import com.android.contacts.ui.contactcreation.model.EmailFieldState +import com.android.contacts.ui.contactcreation.model.PhoneFieldState +import javax.inject.Inject +import kotlinx.collections.immutable.PersistentList +import kotlinx.collections.immutable.persistentListOf +import kotlinx.collections.immutable.toPersistentList + +@Suppress("TooManyFunctions") +internal class ContactFieldsDelegate @Inject constructor() { + + private var phones: PersistentList = persistentListOf(PhoneFieldState()) + private var emails: PersistentList = persistentListOf(EmailFieldState()) + + fun getPhones(): List = phones + + fun getEmails(): List = emails + + fun restorePhones(list: List) { + phones = list.toPersistentList() + } + + fun restoreEmails(list: List) { + emails = list.toPersistentList() + } + + fun addPhone(): List { + phones = phones.add(PhoneFieldState()) + return phones + } + + fun removePhone(id: String): List { + phones = phones.removeAll { it.id == id } + return phones + } + + fun updatePhone(id: String, value: String): List { + phones = phones.map { if (it.id == id) it.copy(number = value) else it }.toPersistentList() + return phones + } + + fun updatePhoneType(id: String, type: PhoneType): List { + phones = phones.map { if (it.id == id) it.copy(type = type) else it }.toPersistentList() + return phones + } + + fun addEmail(): List { + emails = emails.add(EmailFieldState()) + return emails + } + + fun removeEmail(id: String): List { + emails = emails.removeAll { it.id == id } + return emails + } + + fun updateEmail(id: String, value: String): List { + emails = emails.map { if (it.id == id) it.copy(address = value) else it }.toPersistentList() + return emails + } + + fun updateEmailType(id: String, type: EmailType): List { + emails = emails.map { if (it.id == id) it.copy(type = type) else it }.toPersistentList() + return emails + } +} diff --git a/src/com/android/contacts/ui/contactcreation/di/ContactCreationProvidesModule.kt b/src/com/android/contacts/ui/contactcreation/di/ContactCreationProvidesModule.kt new file mode 100644 index 000000000..44936b8d3 --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/di/ContactCreationProvidesModule.kt @@ -0,0 +1,21 @@ +package com.android.contacts.ui.contactcreation.di + +import android.content.Context +import com.android.contacts.model.AccountTypeManager +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.android.qualifiers.ApplicationContext +import dagger.hilt.components.SingletonComponent +import javax.inject.Singleton + +@Module +@InstallIn(SingletonComponent::class) +internal object ContactCreationProvidesModule { + + @Provides + @Singleton + fun provideAccountTypeManager( + @ApplicationContext context: Context, + ): AccountTypeManager = AccountTypeManager.getInstance(context) +} diff --git a/src/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapper.kt b/src/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapper.kt new file mode 100644 index 000000000..07940b1cc --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapper.kt @@ -0,0 +1,114 @@ +package com.android.contacts.ui.contactcreation.mapper + +import android.content.ContentValues +import android.os.Bundle +import android.provider.ContactsContract.CommonDataKinds.Email +import android.provider.ContactsContract.CommonDataKinds.Phone +import android.provider.ContactsContract.CommonDataKinds.StructuredName +import android.provider.ContactsContract.Data +import com.android.contacts.model.RawContact +import com.android.contacts.model.RawContactDelta +import com.android.contacts.model.RawContactDeltaList +import com.android.contacts.model.ValuesDelta +import com.android.contacts.model.account.AccountWithDataSet +import com.android.contacts.ui.contactcreation.component.EmailType +import com.android.contacts.ui.contactcreation.component.PhoneType +import com.android.contacts.ui.contactcreation.model.ContactCreationUiState +import javax.inject.Inject + +internal data class DeltaMapperResult(val state: RawContactDeltaList, val updatedPhotos: Bundle) + +internal class RawContactDeltaMapper @Inject constructor() { + + fun map( + uiState: ContactCreationUiState, + account: AccountWithDataSet?, + ): DeltaMapperResult { + val rawContact = RawContact().apply { + if (account != null) setAccount(account) else setAccountToLocal() + } + val delta = RawContactDelta(ValuesDelta.fromAfter(rawContact.values)) + val updatedPhotos = Bundle() + + mapName(delta, uiState) + mapPhones(delta, uiState) + mapEmails(delta, uiState) + mapPhoto(delta, uiState, updatedPhotos) + + val state = RawContactDeltaList().apply { add(delta) } + return DeltaMapperResult(state = state, updatedPhotos = updatedPhotos) + } + + private fun mapName(delta: RawContactDelta, uiState: ContactCreationUiState) { + val name = uiState.nameState + if (!name.hasData()) return + + delta.addEntry( + ValuesDelta.fromAfter( + contentValues(StructuredName.CONTENT_ITEM_TYPE) { + putIfNotBlank(StructuredName.PREFIX, name.prefix) + putIfNotBlank(StructuredName.GIVEN_NAME, name.first) + putIfNotBlank(StructuredName.MIDDLE_NAME, name.middle) + putIfNotBlank(StructuredName.FAMILY_NAME, name.last) + putIfNotBlank(StructuredName.SUFFIX, name.suffix) + }, + ), + ) + } + + private fun mapPhones(delta: RawContactDelta, uiState: ContactCreationUiState) { + for (phone in uiState.phoneNumbers) { + if (phone.number.isBlank()) continue + delta.addEntry( + ValuesDelta.fromAfter( + contentValues(Phone.CONTENT_ITEM_TYPE) { + put(Phone.NUMBER, phone.number) + put(Phone.TYPE, phone.type.rawValue) + if (phone.type is PhoneType.Custom) { + put(Phone.LABEL, phone.type.label) + } + }, + ), + ) + } + } + + private fun mapEmails(delta: RawContactDelta, uiState: ContactCreationUiState) { + for (email in uiState.emails) { + if (email.address.isBlank()) continue + delta.addEntry( + ValuesDelta.fromAfter( + contentValues(Email.CONTENT_ITEM_TYPE) { + put(Email.DATA, email.address) + put(Email.TYPE, email.type.rawValue) + if (email.type is EmailType.Custom) { + put(Email.LABEL, email.type.label) + } + }, + ), + ) + } + } + + private fun mapPhoto( + delta: RawContactDelta, + uiState: ContactCreationUiState, + updatedPhotos: Bundle, + ) { + val photoUri = uiState.photoUri ?: return + val tempId = delta.values.id + updatedPhotos.putParcelable(tempId.toString(), photoUri) + } + + private inline fun contentValues( + mimeType: String, + block: ContentValues.() -> Unit, + ): ContentValues = ContentValues().apply { + put(Data.MIMETYPE, mimeType) + block() + } + + private fun ContentValues.putIfNotBlank(key: String, value: String) { + if (value.isNotBlank()) put(key, value) + } +} diff --git a/src/com/android/contacts/ui/contactcreation/model/ContactCreationAction.kt b/src/com/android/contacts/ui/contactcreation/model/ContactCreationAction.kt new file mode 100644 index 000000000..9e68ebd40 --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/model/ContactCreationAction.kt @@ -0,0 +1,39 @@ +package com.android.contacts.ui.contactcreation.model + +import android.net.Uri +import com.android.contacts.model.account.AccountWithDataSet +import com.android.contacts.ui.contactcreation.component.EmailType +import com.android.contacts.ui.contactcreation.component.PhoneType + +internal sealed interface ContactCreationAction { + // Navigation + data object NavigateBack : ContactCreationAction + data object Save : ContactCreationAction + data object ConfirmDiscard : ContactCreationAction + + // Name + data class UpdatePrefix(val value: String) : ContactCreationAction + data class UpdateFirstName(val value: String) : ContactCreationAction + data class UpdateMiddleName(val value: String) : ContactCreationAction + data class UpdateLastName(val value: String) : ContactCreationAction + data class UpdateSuffix(val value: String) : ContactCreationAction + + // Phone + data object AddPhone : ContactCreationAction + data class RemovePhone(val id: String) : ContactCreationAction + data class UpdatePhone(val id: String, val value: String) : ContactCreationAction + data class UpdatePhoneType(val id: String, val type: PhoneType) : ContactCreationAction + + // Email + data object AddEmail : ContactCreationAction + data class RemoveEmail(val id: String) : ContactCreationAction + data class UpdateEmail(val id: String, val value: String) : ContactCreationAction + data class UpdateEmailType(val id: String, val type: EmailType) : ContactCreationAction + + // Photo + data class SetPhoto(val uri: Uri) : ContactCreationAction + data object RemovePhoto : ContactCreationAction + + // Account + data class SelectAccount(val account: AccountWithDataSet) : ContactCreationAction +} diff --git a/src/com/android/contacts/ui/contactcreation/model/ContactCreationEffect.kt b/src/com/android/contacts/ui/contactcreation/model/ContactCreationEffect.kt new file mode 100644 index 000000000..282a8034d --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/model/ContactCreationEffect.kt @@ -0,0 +1,12 @@ +package com.android.contacts.ui.contactcreation.model + +import android.net.Uri +import com.android.contacts.ui.contactcreation.mapper.DeltaMapperResult + +internal sealed interface ContactCreationEffect { + data class Save(val result: DeltaMapperResult) : ContactCreationEffect + data class SaveSuccess(val contactUri: Uri?) : ContactCreationEffect + data class ShowError(val messageResId: Int) : ContactCreationEffect + data object ShowDiscardDialog : ContactCreationEffect + data object NavigateBack : ContactCreationEffect +} diff --git a/src/com/android/contacts/ui/contactcreation/model/ContactCreationUiState.kt b/src/com/android/contacts/ui/contactcreation/model/ContactCreationUiState.kt new file mode 100644 index 000000000..0613e68e6 --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/model/ContactCreationUiState.kt @@ -0,0 +1,42 @@ +package com.android.contacts.ui.contactcreation.model + +import android.net.Uri +import android.os.Parcelable +import androidx.compose.runtime.Immutable +import com.android.contacts.model.account.AccountWithDataSet +import com.android.contacts.ui.contactcreation.component.EmailType +import com.android.contacts.ui.contactcreation.component.PhoneType +import java.util.UUID +import kotlinx.parcelize.Parcelize + +@Immutable +@Parcelize +internal data class ContactCreationUiState( + val nameState: NameState = NameState(), + val phoneNumbers: List = listOf(PhoneFieldState()), + val emails: List = listOf(EmailFieldState()), + val photoUri: Uri? = null, + val selectedAccount: AccountWithDataSet? = null, + val accountName: String? = null, + val isSaving: Boolean = false, +) : Parcelable { + fun hasPendingChanges(): Boolean = + nameState.hasData() || + phoneNumbers.any { it.number.isNotBlank() } || + emails.any { it.address.isNotBlank() } || + photoUri != null +} + +@Parcelize +internal data class PhoneFieldState( + val id: String = UUID.randomUUID().toString(), + val number: String = "", + val type: PhoneType = PhoneType.Mobile, +) : Parcelable + +@Parcelize +internal data class EmailFieldState( + val id: String = UUID.randomUUID().toString(), + val address: String = "", + val type: EmailType = EmailType.Home, +) : Parcelable diff --git a/src/com/android/contacts/ui/contactcreation/model/NameState.kt b/src/com/android/contacts/ui/contactcreation/model/NameState.kt new file mode 100644 index 000000000..92ce53d36 --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/model/NameState.kt @@ -0,0 +1,17 @@ +package com.android.contacts.ui.contactcreation.model + +import android.os.Parcelable +import kotlinx.parcelize.Parcelize + +@Parcelize +internal data class NameState( + val prefix: String = "", + val first: String = "", + val middle: String = "", + val last: String = "", + val suffix: String = "", +) : Parcelable { + fun hasData(): Boolean = + prefix.isNotBlank() || first.isNotBlank() || + middle.isNotBlank() || last.isNotBlank() || suffix.isNotBlank() +} From 3f816946ea38f1855902ce327857fb38552f80c5 Mon Sep 17 00:00:00 2001 From: nrobi144 Date: Tue, 14 Apr 2026 14:46:50 +0300 Subject: [PATCH 26/29] =?UTF-8?q?feat(contacts):=20Phase=202=20=E2=80=94?= =?UTF-8?q?=20all=2013=20field=20types=20with=20full=20parity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SDD: tests expanded first (102 unit tests), then implementation. - Add AddressSection (multi-column: street, city, region, postcode, country) - Add OrganizationSection (company + title) - Add MoreFieldsSection with AnimatedVisibility expand/collapse (events, relations, IM, websites, note, nickname, SIP) - Add GroupSection with account-scoped checkbox list - IM correctly uses PROTOCOL + CUSTOM_PROTOCOL (not TYPE + LABEL) - Address blank check spans all 5 sub-fields - Groups cleared on account change - Account-specific SIP field filtering - Mapper expanded: all 13 MIME types → RawContactDeltaList - Delegate expanded: full CRUD for all field types - 40 mapper tests, 46 delegate tests, 16 VM tests - 7 new androidTest files for sections Co-Authored-By: Claude Opus 4.6 (1M context) --- .../component/AddressSectionTest.kt | 92 ++++ .../component/GroupSectionTest.kt | 106 +++++ .../component/MoreFieldsSectionTest.kt | 211 +++++++++ .../delegate/ContactFieldsDelegateTest.kt | 274 +++++++++++ .../mapper/RawContactDeltaMapperTest.kt | 440 +++++++++++++++++- .../ContactCreationEditorScreen.kt | 65 ++- .../ContactCreationViewModel.kt | 128 ++++- .../contacts/ui/contactcreation/TestTags.kt | 56 +++ .../component/AddressSection.kt | 123 +++++ .../ui/contactcreation/component/FieldType.kt | 125 +++++ .../contactcreation/component/GroupSection.kt | 72 +++ .../component/MoreFieldsSection.kt | 361 ++++++++++++++ .../component/OrganizationSection.kt | 52 +++ .../delegate/ContactFieldsDelegate.kt | 231 ++++++++- .../mapper/RawContactDeltaMapper.kt | 174 +++++++ .../model/ContactCreationAction.kt | 59 +++ .../model/ContactCreationUiState.kt | 84 ++++ 17 files changed, 2630 insertions(+), 23 deletions(-) create mode 100644 app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/AddressSectionTest.kt create mode 100644 app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/GroupSectionTest.kt create mode 100644 app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/MoreFieldsSectionTest.kt create mode 100644 src/com/android/contacts/ui/contactcreation/component/AddressSection.kt create mode 100644 src/com/android/contacts/ui/contactcreation/component/GroupSection.kt create mode 100644 src/com/android/contacts/ui/contactcreation/component/MoreFieldsSection.kt create mode 100644 src/com/android/contacts/ui/contactcreation/component/OrganizationSection.kt diff --git a/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/AddressSectionTest.kt b/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/AddressSectionTest.kt new file mode 100644 index 000000000..83e59928c --- /dev/null +++ b/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/AddressSectionTest.kt @@ -0,0 +1,92 @@ +package com.android.contacts.ui.contactcreation.component + +import androidx.activity.ComponentActivity +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.junit4.createAndroidComposeRule +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.test.performClick +import androidx.compose.ui.test.performTextInput +import com.android.contacts.ui.contactcreation.TestTags +import com.android.contacts.ui.contactcreation.model.AddressFieldState +import com.android.contacts.ui.contactcreation.model.ContactCreationAction +import com.android.contacts.ui.core.AppTheme +import kotlin.test.assertIs +import org.junit.Assert.assertEquals +import org.junit.Before +import org.junit.Rule +import org.junit.Test + +class AddressSectionTest { + + @get:Rule + val composeTestRule = createAndroidComposeRule() + + private val capturedActions = mutableListOf() + + @Before + fun setup() { + capturedActions.clear() + } + + @Test + fun rendersAddAddressButton() { + setContent() + composeTestRule.onNodeWithTag(TestTags.ADDRESS_ADD).assertIsDisplayed() + } + + @Test + fun tapAddAddress_dispatchesAddAddressAction() { + setContent() + composeTestRule.onNodeWithTag(TestTags.ADDRESS_ADD).performClick() + assertEquals(ContactCreationAction.AddAddress, capturedActions.last()) + } + + @Test + fun rendersAllAddressSubFields() { + val addresses = listOf(AddressFieldState(id = "1")) + setContent(addresses = addresses) + composeTestRule.onNodeWithTag(TestTags.addressStreet(0)).assertIsDisplayed() + composeTestRule.onNodeWithTag(TestTags.addressCity(0)).assertIsDisplayed() + composeTestRule.onNodeWithTag(TestTags.addressRegion(0)).assertIsDisplayed() + composeTestRule.onNodeWithTag(TestTags.addressPostcode(0)).assertIsDisplayed() + composeTestRule.onNodeWithTag(TestTags.addressCountry(0)).assertIsDisplayed() + } + + @Test + fun typeInStreet_dispatchesUpdateAddressStreet() { + val addresses = listOf(AddressFieldState(id = "1")) + setContent(addresses = addresses) + composeTestRule.onNodeWithTag(TestTags.addressStreet(0)).performTextInput("123 Main") + assertIs(capturedActions.last()) + } + + @Test + fun typeInCity_dispatchesUpdateAddressCity() { + val addresses = listOf(AddressFieldState(id = "1")) + setContent(addresses = addresses) + composeTestRule.onNodeWithTag(TestTags.addressCity(0)).performTextInput("Chicago") + assertIs(capturedActions.last()) + } + + @Test + fun tapDeleteAddress_dispatchesRemoveAddressAction() { + val addresses = listOf(AddressFieldState(id = "1")) + setContent(addresses = addresses) + composeTestRule.onNodeWithTag(TestTags.addressDelete(0)).performClick() + assertIs(capturedActions.last()) + } + + private fun setContent(addresses: List = emptyList()) { + composeTestRule.setContent { + AppTheme { + LazyColumn { + addressSection( + addresses = addresses, + onAction = { capturedActions.add(it) }, + ) + } + } + } + } +} diff --git a/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/GroupSectionTest.kt b/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/GroupSectionTest.kt new file mode 100644 index 000000000..57182aa52 --- /dev/null +++ b/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/GroupSectionTest.kt @@ -0,0 +1,106 @@ +package com.android.contacts.ui.contactcreation.component + +import androidx.activity.ComponentActivity +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.assertIsOff +import androidx.compose.ui.test.assertIsOn +import androidx.compose.ui.test.junit4.createAndroidComposeRule +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.test.performClick +import com.android.contacts.ui.contactcreation.TestTags +import com.android.contacts.ui.contactcreation.model.ContactCreationAction +import com.android.contacts.ui.contactcreation.model.GroupFieldState +import com.android.contacts.ui.contactcreation.model.GroupInfo +import com.android.contacts.ui.core.AppTheme +import kotlin.test.assertIs +import org.junit.Assert.assertEquals +import org.junit.Before +import org.junit.Rule +import org.junit.Test + +class GroupSectionTest { + + @get:Rule + val composeTestRule = createAndroidComposeRule() + + private val capturedActions = mutableListOf() + + @Before + fun setup() { + capturedActions.clear() + } + + @Test + fun noAvailableGroups_sectionNotShown() { + setContent(availableGroups = emptyList()) + composeTestRule.onNodeWithTag(TestTags.GROUP_SECTION).assertDoesNotExist() + } + + @Test + fun availableGroups_showsGroupSection() { + setContent( + availableGroups = listOf(GroupInfo(groupId = 1L, title = "Friends")), + ) + composeTestRule.onNodeWithTag(TestTags.GROUP_SECTION).assertIsDisplayed() + } + + @Test + fun rendersCheckboxForEachGroup() { + setContent( + availableGroups = listOf( + GroupInfo(groupId = 1L, title = "Friends"), + GroupInfo(groupId = 2L, title = "Family"), + ), + ) + composeTestRule.onNodeWithTag(TestTags.groupCheckbox(0)).assertIsDisplayed() + composeTestRule.onNodeWithTag(TestTags.groupCheckbox(1)).assertIsDisplayed() + } + + @Test + fun selectedGroup_showsChecked() { + setContent( + availableGroups = listOf(GroupInfo(groupId = 1L, title = "Friends")), + selectedGroups = listOf(GroupFieldState(groupId = 1L, title = "Friends")), + ) + composeTestRule.onNodeWithTag(TestTags.groupCheckbox(0)).assertIsOn() + } + + @Test + fun unselectedGroup_showsUnchecked() { + setContent( + availableGroups = listOf(GroupInfo(groupId = 1L, title = "Friends")), + selectedGroups = emptyList(), + ) + composeTestRule.onNodeWithTag(TestTags.groupCheckbox(0)).assertIsOff() + } + + @Test + fun tapCheckbox_dispatchesToggleGroupAction() { + setContent( + availableGroups = listOf(GroupInfo(groupId = 42L, title = "Friends")), + ) + composeTestRule.onNodeWithTag(TestTags.groupCheckbox(0)).performClick() + val action = capturedActions.last() + assertIs(action) + assertEquals(42L, action.groupId) + assertEquals("Friends", action.title) + } + + private fun setContent( + availableGroups: List = emptyList(), + selectedGroups: List = emptyList(), + ) { + composeTestRule.setContent { + AppTheme { + LazyColumn { + groupSection( + availableGroups = availableGroups, + selectedGroups = selectedGroups, + onAction = { capturedActions.add(it) }, + ) + } + } + } + } +} diff --git a/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/MoreFieldsSectionTest.kt b/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/MoreFieldsSectionTest.kt new file mode 100644 index 000000000..dca072c76 --- /dev/null +++ b/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/MoreFieldsSectionTest.kt @@ -0,0 +1,211 @@ +package com.android.contacts.ui.contactcreation.component + +import androidx.activity.ComponentActivity +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.junit4.createAndroidComposeRule +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.test.performClick +import androidx.compose.ui.test.performTextInput +import com.android.contacts.ui.contactcreation.TestTags +import com.android.contacts.ui.contactcreation.model.ContactCreationAction +import com.android.contacts.ui.contactcreation.model.EventFieldState +import com.android.contacts.ui.contactcreation.model.ImFieldState +import com.android.contacts.ui.contactcreation.model.RelationFieldState +import com.android.contacts.ui.contactcreation.model.WebsiteFieldState +import com.android.contacts.ui.core.AppTheme +import kotlin.test.assertIs +import org.junit.Assert.assertEquals +import org.junit.Before +import org.junit.Rule +import org.junit.Test + +class MoreFieldsSectionTest { + + @get:Rule + val composeTestRule = createAndroidComposeRule() + + private val capturedActions = mutableListOf() + + @Before + fun setup() { + capturedActions.clear() + } + + @Test + fun rendersMoreFieldsToggle() { + setContent() + composeTestRule.onNodeWithTag(TestTags.MORE_FIELDS_TOGGLE).assertIsDisplayed() + } + + @Test + fun tapToggle_dispatchesToggleMoreFieldsAction() { + setContent() + composeTestRule.onNodeWithTag(TestTags.MORE_FIELDS_TOGGLE).performClick() + assertEquals(ContactCreationAction.ToggleMoreFields, capturedActions.last()) + } + + @Test + fun whenExpanded_showsNicknameField() { + setContent(isExpanded = true) + composeTestRule.onNodeWithTag(TestTags.NICKNAME_FIELD).assertIsDisplayed() + } + + @Test + fun whenExpanded_showsNoteField() { + setContent(isExpanded = true) + composeTestRule.onNodeWithTag(TestTags.NOTE_FIELD).assertIsDisplayed() + } + + @Test + fun whenExpanded_showsSipField() { + setContent(isExpanded = true, showSipField = true) + composeTestRule.onNodeWithTag(TestTags.SIP_FIELD).assertIsDisplayed() + } + + @Test + fun whenExpanded_hiddenSipField_doesNotShow() { + setContent(isExpanded = true, showSipField = false) + composeTestRule.onNodeWithTag(TestTags.SIP_FIELD).assertDoesNotExist() + } + + @Test + fun typeInNickname_dispatchesUpdateNicknameAction() { + setContent(isExpanded = true) + composeTestRule.onNodeWithTag(TestTags.NICKNAME_FIELD).performTextInput("Johnny") + assertIs(capturedActions.last()) + } + + @Test + fun typeInNote_dispatchesUpdateNoteAction() { + setContent(isExpanded = true) + composeTestRule.onNodeWithTag(TestTags.NOTE_FIELD).performTextInput("A note") + assertIs(capturedActions.last()) + } + + @Test + fun typeInSip_dispatchesUpdateSipAddressAction() { + setContent(isExpanded = true, showSipField = true) + composeTestRule.onNodeWithTag(TestTags.SIP_FIELD).performTextInput("sip:user@voip") + assertIs(capturedActions.last()) + } + + @Test + fun whenExpanded_showsEventAddButton() { + setContent(isExpanded = true) + composeTestRule.onNodeWithTag(TestTags.EVENT_ADD).assertIsDisplayed() + } + + @Test + fun tapAddEvent_dispatchesAddEventAction() { + setContent(isExpanded = true) + composeTestRule.onNodeWithTag(TestTags.EVENT_ADD).performClick() + assertEquals(ContactCreationAction.AddEvent, capturedActions.last()) + } + + @Test + fun whenExpanded_showsRelationAddButton() { + setContent(isExpanded = true) + composeTestRule.onNodeWithTag(TestTags.RELATION_ADD).assertIsDisplayed() + } + + @Test + fun whenExpanded_showsImAddButton() { + setContent(isExpanded = true) + composeTestRule.onNodeWithTag(TestTags.IM_ADD).assertIsDisplayed() + } + + @Test + fun whenExpanded_showsWebsiteAddButton() { + setContent(isExpanded = true) + composeTestRule.onNodeWithTag(TestTags.WEBSITE_ADD).assertIsDisplayed() + } + + @Test + fun eventFieldRendered_whenPresent() { + setContent( + isExpanded = true, + events = listOf(EventFieldState(id = "e1", startDate = "2020-01-01")), + ) + composeTestRule.onNodeWithTag(TestTags.eventField(0)).assertIsDisplayed() + } + + @Test + fun typeInEvent_dispatchesUpdateEventAction() { + setContent( + isExpanded = true, + events = listOf(EventFieldState(id = "e1")), + ) + composeTestRule.onNodeWithTag(TestTags.eventField(0)).performTextInput("2020-01-01") + assertIs(capturedActions.last()) + } + + @Test + fun tapDeleteEvent_dispatchesRemoveEventAction() { + setContent( + isExpanded = true, + events = listOf(EventFieldState(id = "e1")), + ) + composeTestRule.onNodeWithTag(TestTags.eventDelete(0)).performClick() + assertIs(capturedActions.last()) + } + + @Test + fun relationFieldRendered_whenPresent() { + setContent( + isExpanded = true, + relations = listOf(RelationFieldState(id = "r1")), + ) + composeTestRule.onNodeWithTag(TestTags.relationField(0)).assertIsDisplayed() + } + + @Test + fun imFieldRendered_whenPresent() { + setContent( + isExpanded = true, + imAccounts = listOf(ImFieldState(id = "im1")), + ) + composeTestRule.onNodeWithTag(TestTags.imField(0)).assertIsDisplayed() + } + + @Test + fun websiteFieldRendered_whenPresent() { + setContent( + isExpanded = true, + websites = listOf(WebsiteFieldState(id = "w1")), + ) + composeTestRule.onNodeWithTag(TestTags.websiteField(0)).assertIsDisplayed() + } + + @Suppress("LongParameterList") + private fun setContent( + isExpanded: Boolean = false, + events: List = emptyList(), + relations: List = emptyList(), + imAccounts: List = emptyList(), + websites: List = emptyList(), + note: String = "", + nickname: String = "", + sipAddress: String = "", + showSipField: Boolean = true, + ) { + composeTestRule.setContent { + AppTheme { + LazyColumn { + moreFieldsSection( + isExpanded = isExpanded, + events = events, + relations = relations, + imAccounts = imAccounts, + websites = websites, + note = note, + nickname = nickname, + sipAddress = sipAddress, + showSipField = showSipField, + onAction = { capturedActions.add(it) }, + ) + } + } + } + } +} diff --git a/app/src/test/java/com/android/contacts/ui/contactcreation/delegate/ContactFieldsDelegateTest.kt b/app/src/test/java/com/android/contacts/ui/contactcreation/delegate/ContactFieldsDelegateTest.kt index 40616894e..e5431af66 100644 --- a/app/src/test/java/com/android/contacts/ui/contactcreation/delegate/ContactFieldsDelegateTest.kt +++ b/app/src/test/java/com/android/contacts/ui/contactcreation/delegate/ContactFieldsDelegateTest.kt @@ -1,11 +1,22 @@ package com.android.contacts.ui.contactcreation.delegate +import com.android.contacts.ui.contactcreation.component.AddressType +import com.android.contacts.ui.contactcreation.component.EventType +import com.android.contacts.ui.contactcreation.component.ImProtocol import com.android.contacts.ui.contactcreation.component.PhoneType +import com.android.contacts.ui.contactcreation.component.RelationType +import com.android.contacts.ui.contactcreation.component.WebsiteType +import com.android.contacts.ui.contactcreation.model.AddressFieldState +import com.android.contacts.ui.contactcreation.model.EventFieldState +import com.android.contacts.ui.contactcreation.model.ImFieldState +import com.android.contacts.ui.contactcreation.model.RelationFieldState +import com.android.contacts.ui.contactcreation.model.WebsiteFieldState import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test +@Suppress("LargeClass") class ContactFieldsDelegateTest { private lateinit var delegate: ContactFieldsDelegate @@ -95,6 +106,241 @@ class ContactFieldsDelegateTest { assertEquals("a@b.com", result[0].address) } + // --- Address --- + + @Test + fun initialState_hasNoAddresses() { + assertTrue(delegate.getAddresses().isEmpty()) + } + + @Test + fun addAddress_addsEmptyRow() { + val addresses = delegate.addAddress() + assertEquals(1, addresses.size) + assertTrue(addresses[0].street.isEmpty()) + } + + @Test + fun removeAddress_removesById() { + delegate.addAddress() + val id = delegate.getAddresses()[0].id + val result = delegate.removeAddress(id) + assertTrue(result.isEmpty()) + } + + @Test + fun updateAddressStreet_updatesValue() { + delegate.addAddress() + val id = delegate.getAddresses()[0].id + val result = delegate.updateAddressStreet(id, "123 Main St") + assertEquals("123 Main St", result[0].street) + } + + @Test + fun updateAddressCity_updatesValue() { + delegate.addAddress() + val id = delegate.getAddresses()[0].id + val result = delegate.updateAddressCity(id, "Chicago") + assertEquals("Chicago", result[0].city) + } + + @Test + fun updateAddressType_updatesValue() { + delegate.addAddress() + val id = delegate.getAddresses()[0].id + val result = delegate.updateAddressType(id, AddressType.Work) + assertEquals(AddressType.Work, result[0].type) + } + + @Test + fun restoreAddresses_replacesInternalState() { + val restored = listOf(AddressFieldState(street = "Restored St")) + delegate.restoreAddresses(restored) + assertEquals("Restored St", delegate.getAddresses()[0].street) + } + + // --- Event --- + + @Test + fun initialState_hasNoEvents() { + assertTrue(delegate.getEvents().isEmpty()) + } + + @Test + fun addEvent_addsEmptyRow() { + val events = delegate.addEvent() + assertEquals(1, events.size) + assertTrue(events[0].startDate.isEmpty()) + } + + @Test + fun removeEvent_removesById() { + delegate.addEvent() + val id = delegate.getEvents()[0].id + val result = delegate.removeEvent(id) + assertTrue(result.isEmpty()) + } + + @Test + fun updateEvent_updatesValue() { + delegate.addEvent() + val id = delegate.getEvents()[0].id + val result = delegate.updateEvent(id, "1990-01-15") + assertEquals("1990-01-15", result[0].startDate) + } + + @Test + fun updateEventType_updatesValue() { + delegate.addEvent() + val id = delegate.getEvents()[0].id + val result = delegate.updateEventType(id, EventType.Anniversary) + assertEquals(EventType.Anniversary, result[0].type) + } + + // --- Relation --- + + @Test + fun initialState_hasNoRelations() { + assertTrue(delegate.getRelations().isEmpty()) + } + + @Test + fun addRelation_addsEmptyRow() { + val relations = delegate.addRelation() + assertEquals(1, relations.size) + assertTrue(relations[0].name.isEmpty()) + } + + @Test + fun removeRelation_removesById() { + delegate.addRelation() + val id = delegate.getRelations()[0].id + val result = delegate.removeRelation(id) + assertTrue(result.isEmpty()) + } + + @Test + fun updateRelation_updatesValue() { + delegate.addRelation() + val id = delegate.getRelations()[0].id + val result = delegate.updateRelation(id, "Jane") + assertEquals("Jane", result[0].name) + } + + @Test + fun updateRelationType_updatesValue() { + delegate.addRelation() + val id = delegate.getRelations()[0].id + val result = delegate.updateRelationType(id, RelationType.Friend) + assertEquals(RelationType.Friend, result[0].type) + } + + // --- IM --- + + @Test + fun initialState_hasNoImAccounts() { + assertTrue(delegate.getImAccounts().isEmpty()) + } + + @Test + fun addIm_addsEmptyRow() { + val ims = delegate.addIm() + assertEquals(1, ims.size) + assertTrue(ims[0].data.isEmpty()) + } + + @Test + fun removeIm_removesById() { + delegate.addIm() + val id = delegate.getImAccounts()[0].id + val result = delegate.removeIm(id) + assertTrue(result.isEmpty()) + } + + @Test + fun updateIm_updatesValue() { + delegate.addIm() + val id = delegate.getImAccounts()[0].id + val result = delegate.updateIm(id, "user@jabber.org") + assertEquals("user@jabber.org", result[0].data) + } + + @Test + fun updateImProtocol_updatesValue() { + delegate.addIm() + val id = delegate.getImAccounts()[0].id + val result = delegate.updateImProtocol(id, ImProtocol.Skype) + assertEquals(ImProtocol.Skype, result[0].protocol) + } + + // --- Website --- + + @Test + fun initialState_hasNoWebsites() { + assertTrue(delegate.getWebsites().isEmpty()) + } + + @Test + fun addWebsite_addsEmptyRow() { + val websites = delegate.addWebsite() + assertEquals(1, websites.size) + assertTrue(websites[0].url.isEmpty()) + } + + @Test + fun removeWebsite_removesById() { + delegate.addWebsite() + val id = delegate.getWebsites()[0].id + val result = delegate.removeWebsite(id) + assertTrue(result.isEmpty()) + } + + @Test + fun updateWebsite_updatesValue() { + delegate.addWebsite() + val id = delegate.getWebsites()[0].id + val result = delegate.updateWebsite(id, "https://example.com") + assertEquals("https://example.com", result[0].url) + } + + @Test + fun updateWebsiteType_updatesValue() { + delegate.addWebsite() + val id = delegate.getWebsites()[0].id + val result = delegate.updateWebsiteType(id, WebsiteType.Blog) + assertEquals(WebsiteType.Blog, result[0].type) + } + + // --- Group --- + + @Test + fun initialState_hasNoGroups() { + assertTrue(delegate.getGroups().isEmpty()) + } + + @Test + fun toggleGroup_addsGroup() { + val groups = delegate.toggleGroup(42L, "Friends") + assertEquals(1, groups.size) + assertEquals(42L, groups[0].groupId) + assertEquals("Friends", groups[0].title) + } + + @Test + fun toggleGroup_removesIfAlreadySelected() { + delegate.toggleGroup(42L, "Friends") + val groups = delegate.toggleGroup(42L, "Friends") + assertTrue(groups.isEmpty()) + } + + @Test + fun clearGroups_removesAll() { + delegate.toggleGroup(1L, "A") + delegate.toggleGroup(2L, "B") + val groups = delegate.clearGroups() + assertTrue(groups.isEmpty()) + } + // --- Restore --- @Test @@ -109,4 +355,32 @@ class ContactFieldsDelegateTest { assertEquals("restored", delegate.getPhones()[0].number) } + + @Test + fun restoreEvents_replacesInternalState() { + val restored = listOf(EventFieldState(startDate = "2020-01-01")) + delegate.restoreEvents(restored) + assertEquals("2020-01-01", delegate.getEvents()[0].startDate) + } + + @Test + fun restoreRelations_replacesInternalState() { + val restored = listOf(RelationFieldState(name = "Bob")) + delegate.restoreRelations(restored) + assertEquals("Bob", delegate.getRelations()[0].name) + } + + @Test + fun restoreImAccounts_replacesInternalState() { + val restored = listOf(ImFieldState(data = "user@im")) + delegate.restoreImAccounts(restored) + assertEquals("user@im", delegate.getImAccounts()[0].data) + } + + @Test + fun restoreWebsites_replacesInternalState() { + val restored = listOf(WebsiteFieldState(url = "https://restored.com")) + delegate.restoreWebsites(restored) + assertEquals("https://restored.com", delegate.getWebsites()[0].url) + } } diff --git a/app/src/test/java/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapperTest.kt b/app/src/test/java/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapperTest.kt index ab4b802d9..d49917ca9 100644 --- a/app/src/test/java/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapperTest.kt +++ b/app/src/test/java/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapperTest.kt @@ -1,14 +1,36 @@ package com.android.contacts.ui.contactcreation.mapper import android.provider.ContactsContract.CommonDataKinds.Email +import android.provider.ContactsContract.CommonDataKinds.Event +import android.provider.ContactsContract.CommonDataKinds.GroupMembership +import android.provider.ContactsContract.CommonDataKinds.Im +import android.provider.ContactsContract.CommonDataKinds.Nickname +import android.provider.ContactsContract.CommonDataKinds.Note +import android.provider.ContactsContract.CommonDataKinds.Organization import android.provider.ContactsContract.CommonDataKinds.Phone +import android.provider.ContactsContract.CommonDataKinds.Relation +import android.provider.ContactsContract.CommonDataKinds.SipAddress import android.provider.ContactsContract.CommonDataKinds.StructuredName +import android.provider.ContactsContract.CommonDataKinds.StructuredPostal +import android.provider.ContactsContract.CommonDataKinds.Website +import com.android.contacts.ui.contactcreation.component.AddressType import com.android.contacts.ui.contactcreation.component.EmailType +import com.android.contacts.ui.contactcreation.component.EventType +import com.android.contacts.ui.contactcreation.component.ImProtocol import com.android.contacts.ui.contactcreation.component.PhoneType +import com.android.contacts.ui.contactcreation.component.RelationType +import com.android.contacts.ui.contactcreation.component.WebsiteType +import com.android.contacts.ui.contactcreation.model.AddressFieldState import com.android.contacts.ui.contactcreation.model.ContactCreationUiState import com.android.contacts.ui.contactcreation.model.EmailFieldState +import com.android.contacts.ui.contactcreation.model.EventFieldState +import com.android.contacts.ui.contactcreation.model.GroupFieldState +import com.android.contacts.ui.contactcreation.model.ImFieldState import com.android.contacts.ui.contactcreation.model.NameState +import com.android.contacts.ui.contactcreation.model.OrganizationFieldState import com.android.contacts.ui.contactcreation.model.PhoneFieldState +import com.android.contacts.ui.contactcreation.model.RelationFieldState +import com.android.contacts.ui.contactcreation.model.WebsiteFieldState import org.junit.Assert.assertEquals import org.junit.Assert.assertNotNull import org.junit.Assert.assertNull @@ -17,11 +39,14 @@ import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner +@Suppress("LargeClass") @RunWith(RobolectricTestRunner::class) class RawContactDeltaMapperTest { private val mapper = RawContactDeltaMapper() + // --- Name --- + @Test fun mapsName_toStructuredNameDelta() { val state = ContactCreationUiState( @@ -69,6 +94,8 @@ class RawContactDeltaMapperTest { assertTrue(entries.isNullOrEmpty()) } + // --- Phone --- + @Test fun mapsPhone_toPhoneDelta() { val state = ContactCreationUiState( @@ -122,6 +149,8 @@ class RawContactDeltaMapperTest { assertEquals("Satellite", entry.getAsString(Phone.LABEL)) } + // --- Email --- + @Test fun mapsEmail_toEmailDelta() { val state = ContactCreationUiState( @@ -161,6 +190,400 @@ class RawContactDeltaMapperTest { assertEquals("VIP", entry.getAsString(Email.LABEL)) } + // --- Address --- + + @Test + fun mapsAddress_toStructuredPostalDelta() { + val state = ContactCreationUiState( + addresses = listOf( + AddressFieldState( + street = "123 Main St", + city = "Springfield", + region = "IL", + postcode = "62701", + country = "US", + type = AddressType.Home, + ), + ), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(StructuredPostal.CONTENT_ITEM_TYPE) + + assertNotNull(entries) + assertEquals(1, entries!!.size) + assertEquals("123 Main St", entries[0].getAsString(StructuredPostal.STREET)) + assertEquals("Springfield", entries[0].getAsString(StructuredPostal.CITY)) + assertEquals("IL", entries[0].getAsString(StructuredPostal.REGION)) + assertEquals("62701", entries[0].getAsString(StructuredPostal.POSTCODE)) + assertEquals("US", entries[0].getAsString(StructuredPostal.COUNTRY)) + assertEquals(StructuredPostal.TYPE_HOME, entries[0].getAsInteger(StructuredPostal.TYPE)) + } + + @Test + fun emptyAddress_notIncluded() { + val state = ContactCreationUiState( + addresses = listOf(AddressFieldState()), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(StructuredPostal.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun addressWithOnlyCityFilled_isIncluded() { + val state = ContactCreationUiState( + addresses = listOf(AddressFieldState(city = "Chicago")), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(StructuredPostal.CONTENT_ITEM_TYPE) + + assertNotNull(entries) + assertEquals(1, entries!!.size) + assertEquals("Chicago", entries[0].getAsString(StructuredPostal.CITY)) + } + + @Test + fun customAddressType_setsBothTypeAndLabel() { + val state = ContactCreationUiState( + addresses = listOf( + AddressFieldState( + street = "1 Elm", + type = AddressType.Custom("Vacation"), + ), + ), + ) + val result = mapper.map(state, account = null) + val entry = result.state[0].getMimeEntries(StructuredPostal.CONTENT_ITEM_TYPE)!![0] + + assertEquals(StructuredPostal.TYPE_CUSTOM, entry.getAsInteger(StructuredPostal.TYPE)) + assertEquals("Vacation", entry.getAsString(StructuredPostal.LABEL)) + } + + // --- Organization --- + + @Test + fun mapsOrganization_toOrgDelta() { + val state = ContactCreationUiState( + organization = OrganizationFieldState(company = "Acme", title = "Engineer"), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Organization.CONTENT_ITEM_TYPE) + + assertNotNull(entries) + assertEquals(1, entries!!.size) + assertEquals("Acme", entries[0].getAsString(Organization.COMPANY)) + assertEquals("Engineer", entries[0].getAsString(Organization.TITLE)) + } + + @Test + fun emptyOrganization_notIncluded() { + val state = ContactCreationUiState( + organization = OrganizationFieldState(), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Organization.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun orgWithOnlyCompany_isIncluded() { + val state = ContactCreationUiState( + organization = OrganizationFieldState(company = "Acme"), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Organization.CONTENT_ITEM_TYPE) + + assertNotNull(entries) + assertEquals(1, entries!!.size) + assertEquals("Acme", entries[0].getAsString(Organization.COMPANY)) + } + + // --- Note --- + + @Test + fun mapsNote_toNoteDelta() { + val state = ContactCreationUiState(note = "Important person") + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Note.CONTENT_ITEM_TYPE) + + assertNotNull(entries) + assertEquals(1, entries!!.size) + assertEquals("Important person", entries[0].getAsString(Note.NOTE)) + } + + @Test + fun emptyNote_notIncluded() { + val state = ContactCreationUiState(note = "") + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Note.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + // --- Website --- + + @Test + fun mapsWebsite_toWebsiteDelta() { + val state = ContactCreationUiState( + websites = listOf( + WebsiteFieldState(url = "https://example.com", type = WebsiteType.Homepage), + ), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Website.CONTENT_ITEM_TYPE) + + assertNotNull(entries) + assertEquals(1, entries!!.size) + assertEquals("https://example.com", entries[0].getAsString(Website.URL)) + assertEquals(Website.TYPE_HOMEPAGE, entries[0].getAsInteger(Website.TYPE)) + } + + @Test + fun emptyWebsite_notIncluded() { + val state = ContactCreationUiState( + websites = listOf(WebsiteFieldState(url = "")), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Website.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun customWebsiteType_setsBothTypeAndLabel() { + val state = ContactCreationUiState( + websites = listOf( + WebsiteFieldState( + url = "https://blog.example.com", + type = WebsiteType.Custom("Portfolio"), + ), + ), + ) + val result = mapper.map(state, account = null) + val entry = result.state[0].getMimeEntries(Website.CONTENT_ITEM_TYPE)!![0] + + assertEquals(Website.TYPE_CUSTOM, entry.getAsInteger(Website.TYPE)) + assertEquals("Portfolio", entry.getAsString(Website.LABEL)) + } + + // --- Event --- + + @Test + fun mapsEvent_toEventDelta() { + val state = ContactCreationUiState( + events = listOf( + EventFieldState(startDate = "1990-01-15", type = EventType.Birthday), + ), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Event.CONTENT_ITEM_TYPE) + + assertNotNull(entries) + assertEquals(1, entries!!.size) + assertEquals("1990-01-15", entries[0].getAsString(Event.START_DATE)) + assertEquals(Event.TYPE_BIRTHDAY, entries[0].getAsInteger(Event.TYPE)) + } + + @Test + fun emptyEvent_notIncluded() { + val state = ContactCreationUiState( + events = listOf(EventFieldState(startDate = "")), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Event.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun customEventType_setsBothTypeAndLabel() { + val state = ContactCreationUiState( + events = listOf( + EventFieldState( + startDate = "2020-06-01", + type = EventType.Custom("First met"), + ), + ), + ) + val result = mapper.map(state, account = null) + val entry = result.state[0].getMimeEntries(Event.CONTENT_ITEM_TYPE)!![0] + + assertEquals(Event.TYPE_CUSTOM, entry.getAsInteger(Event.TYPE)) + assertEquals("First met", entry.getAsString(Event.LABEL)) + } + + // --- Relation --- + + @Test + fun mapsRelation_toRelationDelta() { + val state = ContactCreationUiState( + relations = listOf( + RelationFieldState(name = "Jane Doe", type = RelationType.Spouse), + ), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Relation.CONTENT_ITEM_TYPE) + + assertNotNull(entries) + assertEquals(1, entries!!.size) + assertEquals("Jane Doe", entries[0].getAsString(Relation.NAME)) + assertEquals(Relation.TYPE_SPOUSE, entries[0].getAsInteger(Relation.TYPE)) + } + + @Test + fun emptyRelation_notIncluded() { + val state = ContactCreationUiState( + relations = listOf(RelationFieldState(name = "")), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Relation.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun customRelationType_setsBothTypeAndLabel() { + val state = ContactCreationUiState( + relations = listOf( + RelationFieldState( + name = "Bob", + type = RelationType.Custom("Mentor"), + ), + ), + ) + val result = mapper.map(state, account = null) + val entry = result.state[0].getMimeEntries(Relation.CONTENT_ITEM_TYPE)!![0] + + assertEquals(Relation.TYPE_CUSTOM, entry.getAsInteger(Relation.TYPE)) + assertEquals("Mentor", entry.getAsString(Relation.LABEL)) + } + + // --- IM (PROTOCOL + CUSTOM_PROTOCOL, not TYPE + LABEL) --- + + @Test + fun mapsIm_toImDelta_withProtocol() { + val state = ContactCreationUiState( + imAccounts = listOf( + ImFieldState(data = "user@jabber.org", protocol = ImProtocol.Jabber), + ), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Im.CONTENT_ITEM_TYPE) + + assertNotNull(entries) + assertEquals(1, entries!!.size) + assertEquals("user@jabber.org", entries[0].getAsString(Im.DATA)) + assertEquals(Im.PROTOCOL_JABBER, entries[0].getAsInteger(Im.PROTOCOL)) + } + + @Test + fun emptyIm_notIncluded() { + val state = ContactCreationUiState( + imAccounts = listOf(ImFieldState(data = "")), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Im.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun customImProtocol_setsProtocolAndCustomProtocol() { + val state = ContactCreationUiState( + imAccounts = listOf( + ImFieldState( + data = "user123", + protocol = ImProtocol.Custom("Matrix"), + ), + ), + ) + val result = mapper.map(state, account = null) + val entry = result.state[0].getMimeEntries(Im.CONTENT_ITEM_TYPE)!![0] + + assertEquals(Im.PROTOCOL_CUSTOM, entry.getAsInteger(Im.PROTOCOL)) + assertEquals("Matrix", entry.getAsString(Im.CUSTOM_PROTOCOL)) + } + + // --- Nickname --- + + @Test + fun mapsNickname_toNicknameDelta() { + val state = ContactCreationUiState(nickname = "Johnny") + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Nickname.CONTENT_ITEM_TYPE) + + assertNotNull(entries) + assertEquals(1, entries!!.size) + assertEquals("Johnny", entries[0].getAsString(Nickname.NAME)) + } + + @Test + fun emptyNickname_notIncluded() { + val state = ContactCreationUiState(nickname = "") + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Nickname.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + // --- SIP --- + + @Test + fun mapsSipAddress_toSipDelta() { + val state = ContactCreationUiState(sipAddress = "sip:user@voip.example.com") + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(SipAddress.CONTENT_ITEM_TYPE) + + assertNotNull(entries) + assertEquals(1, entries!!.size) + assertEquals( + "sip:user@voip.example.com", + entries[0].getAsString(SipAddress.SIP_ADDRESS), + ) + } + + @Test + fun emptySipAddress_notIncluded() { + val state = ContactCreationUiState(sipAddress = "") + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(SipAddress.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + // --- Group Membership --- + + @Test + fun mapsGroup_toGroupMembershipDelta() { + val state = ContactCreationUiState( + groups = listOf(GroupFieldState(groupId = 42L, title = "Friends")), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(GroupMembership.CONTENT_ITEM_TYPE) + + assertNotNull(entries) + assertEquals(1, entries!!.size) + assertEquals(42L, entries[0].getAsLong(GroupMembership.GROUP_ROW_ID)) + } + + @Test + fun multipleGroups_producesMultipleEntries() { + val state = ContactCreationUiState( + groups = listOf( + GroupFieldState(groupId = 1L, title = "Friends"), + GroupFieldState(groupId = 2L, title = "Family"), + ), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(GroupMembership.CONTENT_ITEM_TYPE) + + assertEquals(2, entries!!.size) + } + + // --- Account --- + @Test fun nullAccount_setsLocalAccount() { val state = ContactCreationUiState( @@ -168,10 +591,11 @@ class RawContactDeltaMapperTest { ) val result = mapper.map(state, account = null) - // Local account has null account name and type assertNull(result.state[0].values.getAsString("account_name")) } + // --- Mixed fields --- + @Test fun mixedEmptyAndFilledFields_onlyMapsFilledOnes() { val state = ContactCreationUiState( @@ -190,4 +614,18 @@ class RawContactDeltaMapperTest { assertEquals(1, result.state[0].getMimeEntries(Phone.CONTENT_ITEM_TYPE)!!.size) assertEquals(1, result.state[0].getMimeEntries(Email.CONTENT_ITEM_TYPE)!!.size) } + + @Test + fun multipleAddresses_producesMultipleEntries() { + val state = ContactCreationUiState( + addresses = listOf( + AddressFieldState(street = "1 First St"), + AddressFieldState(city = "Second City"), + ), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(StructuredPostal.CONTENT_ITEM_TYPE) + + assertEquals(2, entries!!.size) + } } diff --git a/src/com/android/contacts/ui/contactcreation/ContactCreationEditorScreen.kt b/src/com/android/contacts/ui/contactcreation/ContactCreationEditorScreen.kt index 5e9385365..d73cf5b9c 100644 --- a/src/com/android/contacts/ui/contactcreation/ContactCreationEditorScreen.kt +++ b/src/com/android/contacts/ui/contactcreation/ContactCreationEditorScreen.kt @@ -2,6 +2,7 @@ package com.android.contacts.ui.contactcreation +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.material.icons.Icons @@ -19,8 +20,12 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.testTag import com.android.contacts.ui.contactcreation.component.accountChipItem +import com.android.contacts.ui.contactcreation.component.addressSection import com.android.contacts.ui.contactcreation.component.emailSection +import com.android.contacts.ui.contactcreation.component.groupSection +import com.android.contacts.ui.contactcreation.component.moreFieldsSection import com.android.contacts.ui.contactcreation.component.nameSection +import com.android.contacts.ui.contactcreation.component.organizationSection import com.android.contacts.ui.contactcreation.component.phoneSection import com.android.contacts.ui.contactcreation.model.ContactCreationAction import com.android.contacts.ui.contactcreation.model.ContactCreationUiState @@ -59,26 +64,46 @@ internal fun ContactCreationEditorScreen( ) }, ) { contentPadding -> - LazyColumn( - modifier = Modifier.fillMaxSize(), + ContactCreationFieldsList( + uiState = uiState, + onAction = onAction, contentPadding = contentPadding, - ) { - accountChipItem( - accountName = uiState.accountName, - onAction = onAction, - ) - nameSection( - nameState = uiState.nameState, - onAction = onAction, - ) - phoneSection( - phones = uiState.phoneNumbers, - onAction = onAction, - ) - emailSection( - emails = uiState.emails, - onAction = onAction, - ) - } + ) + } +} + +@Composable +private fun ContactCreationFieldsList( + uiState: ContactCreationUiState, + onAction: (ContactCreationAction) -> Unit, + contentPadding: PaddingValues, +) { + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = contentPadding, + ) { + accountChipItem(accountName = uiState.accountName, onAction = onAction) + nameSection(nameState = uiState.nameState, onAction = onAction) + phoneSection(phones = uiState.phoneNumbers, onAction = onAction) + emailSection(emails = uiState.emails, onAction = onAction) + addressSection(addresses = uiState.addresses, onAction = onAction) + organizationSection(organization = uiState.organization, onAction = onAction) + moreFieldsSection( + isExpanded = uiState.isMoreFieldsExpanded, + events = uiState.events, + relations = uiState.relations, + imAccounts = uiState.imAccounts, + websites = uiState.websites, + note = uiState.note, + nickname = uiState.nickname, + sipAddress = uiState.sipAddress, + showSipField = uiState.showSipField, + onAction = onAction, + ) + groupSection( + availableGroups = uiState.availableGroups, + selectedGroups = uiState.groups, + onAction = onAction, + ) } } diff --git a/src/com/android/contacts/ui/contactcreation/ContactCreationViewModel.kt b/src/com/android/contacts/ui/contactcreation/ContactCreationViewModel.kt index ad0ced745..881340ef6 100644 --- a/src/com/android/contacts/ui/contactcreation/ContactCreationViewModel.kt +++ b/src/com/android/contacts/ui/contactcreation/ContactCreationViewModel.kt @@ -54,13 +54,19 @@ internal class ContactCreationViewModel @Inject constructor( if (restored != null) { fieldsDelegate.restorePhones(restored.phoneNumbers) fieldsDelegate.restoreEmails(restored.emails) + fieldsDelegate.restoreAddresses(restored.addresses) + fieldsDelegate.restoreEvents(restored.events) + fieldsDelegate.restoreRelations(restored.relations) + fieldsDelegate.restoreImAccounts(restored.imAccounts) + fieldsDelegate.restoreWebsites(restored.websites) + fieldsDelegate.restoreGroups(restored.groups) } viewModelScope.launch { _uiState.collect { savedStateHandle[STATE_KEY] = it } } } - @Suppress("CyclomaticComplexMethod") + @Suppress("CyclomaticComplexMethod", "LongMethod") fun onAction(action: ContactCreationAction) { when (action) { is ContactCreationAction.NavigateBack -> handleBack() @@ -100,6 +106,125 @@ internal class ContactCreationViewModel @Inject constructor( copy(emails = fieldsDelegate.updateEmailType(action.id, action.type)) } + // Address + is ContactCreationAction.AddAddress -> + updateState { copy(addresses = fieldsDelegate.addAddress()) } + is ContactCreationAction.RemoveAddress -> + updateState { copy(addresses = fieldsDelegate.removeAddress(action.id)) } + is ContactCreationAction.UpdateAddressStreet -> + updateState { + copy(addresses = fieldsDelegate.updateAddressStreet(action.id, action.value)) + } + is ContactCreationAction.UpdateAddressCity -> + updateState { + copy(addresses = fieldsDelegate.updateAddressCity(action.id, action.value)) + } + is ContactCreationAction.UpdateAddressRegion -> + updateState { + copy(addresses = fieldsDelegate.updateAddressRegion(action.id, action.value)) + } + is ContactCreationAction.UpdateAddressPostcode -> + updateState { + copy(addresses = fieldsDelegate.updateAddressPostcode(action.id, action.value)) + } + is ContactCreationAction.UpdateAddressCountry -> + updateState { + copy(addresses = fieldsDelegate.updateAddressCountry(action.id, action.value)) + } + is ContactCreationAction.UpdateAddressType -> + updateState { + copy(addresses = fieldsDelegate.updateAddressType(action.id, action.type)) + } + + // Organization + is ContactCreationAction.UpdateCompany -> + updateState { copy(organization = organization.copy(company = action.value)) } + is ContactCreationAction.UpdateJobTitle -> + updateState { copy(organization = organization.copy(title = action.value)) } + + // Event + is ContactCreationAction.AddEvent -> + updateState { copy(events = fieldsDelegate.addEvent()) } + is ContactCreationAction.RemoveEvent -> + updateState { copy(events = fieldsDelegate.removeEvent(action.id)) } + is ContactCreationAction.UpdateEvent -> + updateState { + copy(events = fieldsDelegate.updateEvent(action.id, action.value)) + } + is ContactCreationAction.UpdateEventType -> + updateState { + copy(events = fieldsDelegate.updateEventType(action.id, action.type)) + } + + // Relation + is ContactCreationAction.AddRelation -> + updateState { copy(relations = fieldsDelegate.addRelation()) } + is ContactCreationAction.RemoveRelation -> + updateState { copy(relations = fieldsDelegate.removeRelation(action.id)) } + is ContactCreationAction.UpdateRelation -> + updateState { + copy(relations = fieldsDelegate.updateRelation(action.id, action.value)) + } + is ContactCreationAction.UpdateRelationType -> + updateState { + copy(relations = fieldsDelegate.updateRelationType(action.id, action.type)) + } + + // IM + is ContactCreationAction.AddIm -> + updateState { copy(imAccounts = fieldsDelegate.addIm()) } + is ContactCreationAction.RemoveIm -> + updateState { copy(imAccounts = fieldsDelegate.removeIm(action.id)) } + is ContactCreationAction.UpdateIm -> + updateState { + copy(imAccounts = fieldsDelegate.updateIm(action.id, action.value)) + } + is ContactCreationAction.UpdateImProtocol -> + updateState { + copy( + imAccounts = fieldsDelegate.updateImProtocol( + action.id, + action.protocol, + ), + ) + } + + // Website + is ContactCreationAction.AddWebsite -> + updateState { copy(websites = fieldsDelegate.addWebsite()) } + is ContactCreationAction.RemoveWebsite -> + updateState { copy(websites = fieldsDelegate.removeWebsite(action.id)) } + is ContactCreationAction.UpdateWebsite -> + updateState { + copy(websites = fieldsDelegate.updateWebsite(action.id, action.value)) + } + is ContactCreationAction.UpdateWebsiteType -> + updateState { + copy(websites = fieldsDelegate.updateWebsiteType(action.id, action.type)) + } + + // Note + is ContactCreationAction.UpdateNote -> + updateState { copy(note = action.value) } + + // Nickname + is ContactCreationAction.UpdateNickname -> + updateState { copy(nickname = action.value) } + + // SIP + is ContactCreationAction.UpdateSipAddress -> + updateState { copy(sipAddress = action.value) } + + // Groups + is ContactCreationAction.ToggleGroup -> + updateState { + copy(groups = fieldsDelegate.toggleGroup(action.groupId, action.title)) + } + + // More fields + is ContactCreationAction.ToggleMoreFields -> + updateState { copy(isMoreFieldsExpanded = !isMoreFieldsExpanded) } + // Photo is ContactCreationAction.SetPhoto -> updateState { copy(photoUri = action.uri) } @@ -112,6 +237,7 @@ internal class ContactCreationViewModel @Inject constructor( copy( selectedAccount = action.account, accountName = action.account.name, + groups = fieldsDelegate.clearGroups(), ) } } diff --git a/src/com/android/contacts/ui/contactcreation/TestTags.kt b/src/com/android/contacts/ui/contactcreation/TestTags.kt index a6e4ab589..d051a25e6 100644 --- a/src/com/android/contacts/ui/contactcreation/TestTags.kt +++ b/src/com/android/contacts/ui/contactcreation/TestTags.kt @@ -1,5 +1,6 @@ package com.android.contacts.ui.contactcreation +@Suppress("TooManyFunctions") internal object TestTags { // Top-level const val SAVE_BUTTON = "contact_creation_save_button" @@ -24,6 +25,61 @@ internal object TestTags { fun emailDelete(index: Int): String = "contact_creation_email_delete_$index" fun emailType(index: Int): String = "contact_creation_email_type_$index" + // Address section + const val ADDRESS_ADD = "contact_creation_address_add" + fun addressStreet(index: Int): String = "contact_creation_address_street_$index" + fun addressCity(index: Int): String = "contact_creation_address_city_$index" + fun addressRegion(index: Int): String = "contact_creation_address_region_$index" + fun addressPostcode(index: Int): String = "contact_creation_address_postcode_$index" + fun addressCountry(index: Int): String = "contact_creation_address_country_$index" + fun addressDelete(index: Int): String = "contact_creation_address_delete_$index" + fun addressType(index: Int): String = "contact_creation_address_type_$index" + + // Organization section + const val ORG_COMPANY = "contact_creation_org_company" + const val ORG_TITLE = "contact_creation_org_title" + + // More fields section + const val MORE_FIELDS_TOGGLE = "contact_creation_more_fields_toggle" + const val MORE_FIELDS_CONTENT = "contact_creation_more_fields_content" + + // Event + const val EVENT_ADD = "contact_creation_event_add" + fun eventField(index: Int): String = "contact_creation_event_field_$index" + fun eventDelete(index: Int): String = "contact_creation_event_delete_$index" + fun eventType(index: Int): String = "contact_creation_event_type_$index" + + // Relation + const val RELATION_ADD = "contact_creation_relation_add" + fun relationField(index: Int): String = "contact_creation_relation_field_$index" + fun relationDelete(index: Int): String = "contact_creation_relation_delete_$index" + fun relationType(index: Int): String = "contact_creation_relation_type_$index" + + // IM + const val IM_ADD = "contact_creation_im_add" + fun imField(index: Int): String = "contact_creation_im_field_$index" + fun imDelete(index: Int): String = "contact_creation_im_delete_$index" + fun imProtocol(index: Int): String = "contact_creation_im_protocol_$index" + + // Website + const val WEBSITE_ADD = "contact_creation_website_add" + fun websiteField(index: Int): String = "contact_creation_website_field_$index" + fun websiteDelete(index: Int): String = "contact_creation_website_delete_$index" + fun websiteType(index: Int): String = "contact_creation_website_type_$index" + + // Note + const val NOTE_FIELD = "contact_creation_note_field" + + // Nickname + const val NICKNAME_FIELD = "contact_creation_nickname_field" + + // SIP + const val SIP_FIELD = "contact_creation_sip_field" + + // Group section + const val GROUP_SECTION = "contact_creation_group_section" + fun groupCheckbox(index: Int): String = "contact_creation_group_checkbox_$index" + // Account const val ACCOUNT_CHIP = "contact_creation_account_chip" diff --git a/src/com/android/contacts/ui/contactcreation/component/AddressSection.kt b/src/com/android/contacts/ui/contactcreation/component/AddressSection.kt new file mode 100644 index 000000000..4893f27b6 --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/component/AddressSection.kt @@ -0,0 +1,123 @@ +package com.android.contacts.ui.contactcreation.component + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyListScope +import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.Close +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.unit.dp +import com.android.contacts.ui.contactcreation.TestTags +import com.android.contacts.ui.contactcreation.model.AddressFieldState +import com.android.contacts.ui.contactcreation.model.ContactCreationAction + +internal fun LazyListScope.addressSection( + addresses: List, + onAction: (ContactCreationAction) -> Unit, +) { + itemsIndexed( + items = addresses, + key = { _, item -> item.id }, + contentType = { _, _ -> "address_field" }, + ) { index, address -> + AddressFieldRow( + address = address, + index = index, + onAction = onAction, + modifier = Modifier.animateItem(), + ) + } + item(key = "address_add", contentType = "address_add") { + TextButton( + onClick = { onAction(ContactCreationAction.AddAddress) }, + modifier = Modifier + .padding(start = 16.dp) + .testTag(TestTags.ADDRESS_ADD), + ) { + Icon(Icons.Filled.Add, contentDescription = null) + Text("Add address") + } + } +} + +@Composable +internal fun AddressFieldRow( + address: AddressFieldState, + index: Int, + onAction: (ContactCreationAction) -> Unit, + modifier: Modifier = Modifier, +) { + Row( + modifier = modifier.padding(horizontal = 16.dp), + verticalAlignment = Alignment.Top, + ) { + AddressFieldColumns( + address = address, + index = index, + onAction = onAction, + modifier = Modifier.weight(1f), + ) + IconButton( + onClick = { onAction(ContactCreationAction.RemoveAddress(address.id)) }, + modifier = Modifier.testTag(TestTags.addressDelete(index)), + ) { + Icon(Icons.Filled.Close, contentDescription = "Remove address") + } + } +} + +@Composable +private fun AddressFieldColumns( + address: AddressFieldState, + index: Int, + onAction: (ContactCreationAction) -> Unit, + modifier: Modifier = Modifier, +) { + Column(modifier = modifier) { + AddressTextField(address.street, "Street", TestTags.addressStreet(index)) { + onAction(ContactCreationAction.UpdateAddressStreet(address.id, it)) + } + AddressTextField(address.city, "City", TestTags.addressCity(index)) { + onAction(ContactCreationAction.UpdateAddressCity(address.id, it)) + } + AddressTextField(address.region, "State/Region", TestTags.addressRegion(index)) { + onAction(ContactCreationAction.UpdateAddressRegion(address.id, it)) + } + AddressTextField(address.postcode, "Postal code", TestTags.addressPostcode(index)) { + onAction(ContactCreationAction.UpdateAddressPostcode(address.id, it)) + } + AddressTextField(address.country, "Country", TestTags.addressCountry(index)) { + onAction(ContactCreationAction.UpdateAddressCountry(address.id, it)) + } + } +} + +@Composable +private fun AddressTextField( + value: String, + label: String, + tag: String, + onValueChange: (String) -> Unit, +) { + OutlinedTextField( + value = value, + onValueChange = onValueChange, + label = { Text(label) }, + modifier = Modifier + .fillMaxWidth() + .testTag(tag), + singleLine = true, + ) +} diff --git a/src/com/android/contacts/ui/contactcreation/component/FieldType.kt b/src/com/android/contacts/ui/contactcreation/component/FieldType.kt index 5a611c981..ce96dee56 100644 --- a/src/com/android/contacts/ui/contactcreation/component/FieldType.kt +++ b/src/com/android/contacts/ui/contactcreation/component/FieldType.kt @@ -2,7 +2,12 @@ package com.android.contacts.ui.contactcreation.component import android.os.Parcelable import android.provider.ContactsContract.CommonDataKinds.Email +import android.provider.ContactsContract.CommonDataKinds.Event +import android.provider.ContactsContract.CommonDataKinds.Im import android.provider.ContactsContract.CommonDataKinds.Phone +import android.provider.ContactsContract.CommonDataKinds.Relation +import android.provider.ContactsContract.CommonDataKinds.StructuredPostal +import android.provider.ContactsContract.CommonDataKinds.Website import kotlinx.parcelize.Parcelize @Parcelize @@ -50,3 +55,123 @@ internal sealed class EmailType : Parcelable { is Custom -> Email.TYPE_CUSTOM } } + +@Parcelize +internal sealed class AddressType : Parcelable { + data object Home : AddressType() + data object Work : AddressType() + data object Other : AddressType() + data class Custom(val label: String) : AddressType() + + val rawValue: Int + get() = when (this) { + is Home -> StructuredPostal.TYPE_HOME + is Work -> StructuredPostal.TYPE_WORK + is Other -> StructuredPostal.TYPE_OTHER + is Custom -> StructuredPostal.TYPE_CUSTOM + } +} + +@Parcelize +internal sealed class EventType : Parcelable { + data object Birthday : EventType() + data object Anniversary : EventType() + data object Other : EventType() + data class Custom(val label: String) : EventType() + + val rawValue: Int + get() = when (this) { + is Birthday -> Event.TYPE_BIRTHDAY + is Anniversary -> Event.TYPE_ANNIVERSARY + is Other -> Event.TYPE_OTHER + is Custom -> Event.TYPE_CUSTOM + } +} + +@Parcelize +internal sealed class RelationType : Parcelable { + data object Assistant : RelationType() + data object Brother : RelationType() + data object Child : RelationType() + data object DomesticPartner : RelationType() + data object Father : RelationType() + data object Friend : RelationType() + data object Manager : RelationType() + data object Mother : RelationType() + data object Parent : RelationType() + data object Partner : RelationType() + data object Sister : RelationType() + data object Spouse : RelationType() + data object Relative : RelationType() + data object ReferredBy : RelationType() + data class Custom(val label: String) : RelationType() + + val rawValue: Int + get() = when (this) { + is Assistant -> Relation.TYPE_ASSISTANT + is Brother -> Relation.TYPE_BROTHER + is Child -> Relation.TYPE_CHILD + is DomesticPartner -> Relation.TYPE_DOMESTIC_PARTNER + is Father -> Relation.TYPE_FATHER + is Friend -> Relation.TYPE_FRIEND + is Manager -> Relation.TYPE_MANAGER + is Mother -> Relation.TYPE_MOTHER + is Parent -> Relation.TYPE_PARENT + is Partner -> Relation.TYPE_PARTNER + is Sister -> Relation.TYPE_SISTER + is Spouse -> Relation.TYPE_SPOUSE + is Relative -> Relation.TYPE_RELATIVE + is ReferredBy -> Relation.TYPE_REFERRED_BY + is Custom -> Relation.TYPE_CUSTOM + } +} + +@Parcelize +internal sealed class ImProtocol : Parcelable { + data object Aim : ImProtocol() + data object Msn : ImProtocol() + data object Yahoo : ImProtocol() + data object Skype : ImProtocol() + data object Qq : ImProtocol() + data object GoogleTalk : ImProtocol() + data object Icq : ImProtocol() + data object Jabber : ImProtocol() + data class Custom(val label: String) : ImProtocol() + + val rawValue: Int + get() = when (this) { + is Aim -> Im.PROTOCOL_AIM + is Msn -> Im.PROTOCOL_MSN + is Yahoo -> Im.PROTOCOL_YAHOO + is Skype -> Im.PROTOCOL_SKYPE + is Qq -> Im.PROTOCOL_QQ + is GoogleTalk -> Im.PROTOCOL_GOOGLE_TALK + is Icq -> Im.PROTOCOL_ICQ + is Jabber -> Im.PROTOCOL_JABBER + is Custom -> Im.PROTOCOL_CUSTOM + } +} + +@Parcelize +internal sealed class WebsiteType : Parcelable { + data object Homepage : WebsiteType() + data object Blog : WebsiteType() + data object Profile : WebsiteType() + data object Home : WebsiteType() + data object Work : WebsiteType() + data object Ftp : WebsiteType() + data object Other : WebsiteType() + data class Custom(val label: String) : WebsiteType() + + val rawValue: Int + get() = when (this) { + is Homepage -> Website.TYPE_HOMEPAGE + is Blog -> Website.TYPE_BLOG + is Profile -> Website.TYPE_PROFILE + is Home -> Website.TYPE_HOME + is Work -> Website.TYPE_WORK + is Ftp -> Website.TYPE_FTP + is Other -> Website.TYPE_OTHER + is Custom -> Website.TYPE_CUSTOM + } +} diff --git a/src/com/android/contacts/ui/contactcreation/component/GroupSection.kt b/src/com/android/contacts/ui/contactcreation/component/GroupSection.kt new file mode 100644 index 000000000..074a54a2d --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/component/GroupSection.kt @@ -0,0 +1,72 @@ +package com.android.contacts.ui.contactcreation.component + +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyListScope +import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.material3.Checkbox +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.unit.dp +import com.android.contacts.ui.contactcreation.TestTags +import com.android.contacts.ui.contactcreation.model.ContactCreationAction +import com.android.contacts.ui.contactcreation.model.GroupFieldState +import com.android.contacts.ui.contactcreation.model.GroupInfo + +internal fun LazyListScope.groupSection( + availableGroups: List, + selectedGroups: List, + onAction: (ContactCreationAction) -> Unit, +) { + if (availableGroups.isEmpty()) return + + item(key = "group_header", contentType = "group_header") { + Text( + text = "Groups", + modifier = Modifier + .padding(start = 16.dp, top = 16.dp, bottom = 8.dp) + .testTag(TestTags.GROUP_SECTION), + ) + } + itemsIndexed( + items = availableGroups, + key = { _, group -> "group_${group.groupId}" }, + contentType = { _, _ -> "group_checkbox" }, + ) { index, group -> + GroupCheckboxRow( + group = group, + isSelected = selectedGroups.any { it.groupId == group.groupId }, + index = index, + onAction = onAction, + ) + } +} + +@Composable +internal fun GroupCheckboxRow( + group: GroupInfo, + isSelected: Boolean, + index: Int, + onAction: (ContactCreationAction) -> Unit, + modifier: Modifier = Modifier, +) { + Row( + modifier = modifier + .fillMaxWidth() + .padding(horizontal = 16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Checkbox( + checked = isSelected, + onCheckedChange = { + onAction(ContactCreationAction.ToggleGroup(group.groupId, group.title)) + }, + modifier = Modifier.testTag(TestTags.groupCheckbox(index)), + ) + Text(text = group.title) + } +} diff --git a/src/com/android/contacts/ui/contactcreation/component/MoreFieldsSection.kt b/src/com/android/contacts/ui/contactcreation/component/MoreFieldsSection.kt new file mode 100644 index 000000000..f0cec8d35 --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/component/MoreFieldsSection.kt @@ -0,0 +1,361 @@ +@file:Suppress("TooManyFunctions") + +package com.android.contacts.ui.contactcreation.component + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.expandVertically +import androidx.compose.animation.shrinkVertically +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyListScope +import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.filled.ExpandLess +import androidx.compose.material.icons.filled.ExpandMore +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.unit.dp +import com.android.contacts.ui.contactcreation.TestTags +import com.android.contacts.ui.contactcreation.model.ContactCreationAction +import com.android.contacts.ui.contactcreation.model.EventFieldState +import com.android.contacts.ui.contactcreation.model.ImFieldState +import com.android.contacts.ui.contactcreation.model.RelationFieldState +import com.android.contacts.ui.contactcreation.model.WebsiteFieldState + +@Suppress("LongParameterList") +internal fun LazyListScope.moreFieldsSection( + isExpanded: Boolean, + events: List, + relations: List, + imAccounts: List, + websites: List, + note: String, + nickname: String, + sipAddress: String, + showSipField: Boolean, + onAction: (ContactCreationAction) -> Unit, +) { + moreFieldsToggle(isExpanded, onAction) + moreFieldsContent(isExpanded, nickname, note, sipAddress, showSipField, onAction) + if (isExpanded) { + eventItems(events, onAction) + relationItems(relations, onAction) + imItems(imAccounts, onAction) + websiteItems(websites, onAction) + } +} + +private fun LazyListScope.moreFieldsToggle( + isExpanded: Boolean, + onAction: (ContactCreationAction) -> Unit, +) { + item(key = "more_fields_toggle", contentType = "more_fields_toggle") { + TextButton( + onClick = { onAction(ContactCreationAction.ToggleMoreFields) }, + modifier = Modifier + .padding(start = 16.dp) + .testTag(TestTags.MORE_FIELDS_TOGGLE), + ) { + Icon( + if (isExpanded) Icons.Filled.ExpandLess else Icons.Filled.ExpandMore, + contentDescription = null, + ) + Text(if (isExpanded) "Less fields" else "More fields") + } + } +} + +@Suppress("LongParameterList") +private fun LazyListScope.moreFieldsContent( + isExpanded: Boolean, + nickname: String, + note: String, + sipAddress: String, + showSipField: Boolean, + onAction: (ContactCreationAction) -> Unit, +) { + item(key = "more_fields_content", contentType = "more_fields_content") { + AnimatedVisibility( + visible = isExpanded, + enter = expandVertically(), + exit = shrinkVertically(), + modifier = Modifier.testTag(TestTags.MORE_FIELDS_CONTENT), + ) { + MoreFieldsSingleFields(nickname, note, sipAddress, showSipField, onAction) + } + } +} + +@Composable +private fun MoreFieldsSingleFields( + nickname: String, + note: String, + sipAddress: String, + showSipField: Boolean, + onAction: (ContactCreationAction) -> Unit, +) { + Column { + OutlinedTextField( + value = nickname, + onValueChange = { onAction(ContactCreationAction.UpdateNickname(it)) }, + label = { Text("Nickname") }, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp) + .testTag(TestTags.NICKNAME_FIELD), + singleLine = true, + ) + OutlinedTextField( + value = note, + onValueChange = { onAction(ContactCreationAction.UpdateNote(it)) }, + label = { Text("Note") }, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp) + .testTag(TestTags.NOTE_FIELD), + ) + if (showSipField) { + OutlinedTextField( + value = sipAddress, + onValueChange = { onAction(ContactCreationAction.UpdateSipAddress(it)) }, + label = { Text("SIP") }, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp) + .testTag(TestTags.SIP_FIELD), + singleLine = true, + ) + } + } +} + +// --- Events --- + +private fun LazyListScope.eventItems( + events: List, + onAction: (ContactCreationAction) -> Unit, +) { + itemsIndexed( + items = events, + key = { _, item -> "event_${item.id}" }, + contentType = { _, _ -> "event_field" }, + ) { index, event -> + EventFieldRow(event = event, index = index, onAction = onAction) + } + item(key = "event_add", contentType = "event_add") { + TextButton( + onClick = { onAction(ContactCreationAction.AddEvent) }, + modifier = Modifier + .padding(start = 16.dp) + .testTag(TestTags.EVENT_ADD), + ) { + Icon(Icons.Filled.Add, contentDescription = null) + Text("Add event") + } + } +} + +@Composable +private fun EventFieldRow( + event: EventFieldState, + index: Int, + onAction: (ContactCreationAction) -> Unit, + modifier: Modifier = Modifier, +) { + Row( + modifier = modifier.padding(horizontal = 16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + OutlinedTextField( + value = event.startDate, + onValueChange = { onAction(ContactCreationAction.UpdateEvent(event.id, it)) }, + label = { Text("Date") }, + modifier = Modifier + .weight(1f) + .testTag(TestTags.eventField(index)), + singleLine = true, + ) + IconButton( + onClick = { onAction(ContactCreationAction.RemoveEvent(event.id)) }, + modifier = Modifier.testTag(TestTags.eventDelete(index)), + ) { + Icon(Icons.Filled.Close, contentDescription = "Remove event") + } + } +} + +// --- Relations --- + +private fun LazyListScope.relationItems( + relations: List, + onAction: (ContactCreationAction) -> Unit, +) { + itemsIndexed( + items = relations, + key = { _, item -> "relation_${item.id}" }, + contentType = { _, _ -> "relation_field" }, + ) { index, relation -> + RelationFieldRow(relation = relation, index = index, onAction = onAction) + } + item(key = "relation_add", contentType = "relation_add") { + TextButton( + onClick = { onAction(ContactCreationAction.AddRelation) }, + modifier = Modifier + .padding(start = 16.dp) + .testTag(TestTags.RELATION_ADD), + ) { + Icon(Icons.Filled.Add, contentDescription = null) + Text("Add relation") + } + } +} + +@Composable +private fun RelationFieldRow( + relation: RelationFieldState, + index: Int, + onAction: (ContactCreationAction) -> Unit, + modifier: Modifier = Modifier, +) { + Row( + modifier = modifier.padding(horizontal = 16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + OutlinedTextField( + value = relation.name, + onValueChange = { onAction(ContactCreationAction.UpdateRelation(relation.id, it)) }, + label = { Text("Relation") }, + modifier = Modifier + .weight(1f) + .testTag(TestTags.relationField(index)), + singleLine = true, + ) + IconButton( + onClick = { onAction(ContactCreationAction.RemoveRelation(relation.id)) }, + modifier = Modifier.testTag(TestTags.relationDelete(index)), + ) { + Icon(Icons.Filled.Close, contentDescription = "Remove relation") + } + } +} + +// --- IM --- + +private fun LazyListScope.imItems( + imAccounts: List, + onAction: (ContactCreationAction) -> Unit, +) { + itemsIndexed( + items = imAccounts, + key = { _, item -> "im_${item.id}" }, + contentType = { _, _ -> "im_field" }, + ) { index, im -> + ImFieldRow(im = im, index = index, onAction = onAction) + } + item(key = "im_add", contentType = "im_add") { + TextButton( + onClick = { onAction(ContactCreationAction.AddIm) }, + modifier = Modifier + .padding(start = 16.dp) + .testTag(TestTags.IM_ADD), + ) { + Icon(Icons.Filled.Add, contentDescription = null) + Text("Add IM") + } + } +} + +@Composable +private fun ImFieldRow( + im: ImFieldState, + index: Int, + onAction: (ContactCreationAction) -> Unit, + modifier: Modifier = Modifier, +) { + Row( + modifier = modifier.padding(horizontal = 16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + OutlinedTextField( + value = im.data, + onValueChange = { onAction(ContactCreationAction.UpdateIm(im.id, it)) }, + label = { Text("IM") }, + modifier = Modifier + .weight(1f) + .testTag(TestTags.imField(index)), + singleLine = true, + ) + IconButton( + onClick = { onAction(ContactCreationAction.RemoveIm(im.id)) }, + modifier = Modifier.testTag(TestTags.imDelete(index)), + ) { + Icon(Icons.Filled.Close, contentDescription = "Remove IM") + } + } +} + +// --- Website --- + +private fun LazyListScope.websiteItems( + websites: List, + onAction: (ContactCreationAction) -> Unit, +) { + itemsIndexed( + items = websites, + key = { _, item -> "website_${item.id}" }, + contentType = { _, _ -> "website_field" }, + ) { index, website -> + WebsiteFieldRow(website = website, index = index, onAction = onAction) + } + item(key = "website_add", contentType = "website_add") { + TextButton( + onClick = { onAction(ContactCreationAction.AddWebsite) }, + modifier = Modifier + .padding(start = 16.dp) + .testTag(TestTags.WEBSITE_ADD), + ) { + Icon(Icons.Filled.Add, contentDescription = null) + Text("Add website") + } + } +} + +@Composable +private fun WebsiteFieldRow( + website: WebsiteFieldState, + index: Int, + onAction: (ContactCreationAction) -> Unit, + modifier: Modifier = Modifier, +) { + Row( + modifier = modifier.padding(horizontal = 16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + OutlinedTextField( + value = website.url, + onValueChange = { onAction(ContactCreationAction.UpdateWebsite(website.id, it)) }, + label = { Text("Website") }, + modifier = Modifier + .weight(1f) + .testTag(TestTags.websiteField(index)), + singleLine = true, + ) + IconButton( + onClick = { onAction(ContactCreationAction.RemoveWebsite(website.id)) }, + modifier = Modifier.testTag(TestTags.websiteDelete(index)), + ) { + Icon(Icons.Filled.Close, contentDescription = "Remove website") + } + } +} diff --git a/src/com/android/contacts/ui/contactcreation/component/OrganizationSection.kt b/src/com/android/contacts/ui/contactcreation/component/OrganizationSection.kt new file mode 100644 index 000000000..9c94b5de2 --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/component/OrganizationSection.kt @@ -0,0 +1,52 @@ +package com.android.contacts.ui.contactcreation.component + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyListScope +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.unit.dp +import com.android.contacts.ui.contactcreation.TestTags +import com.android.contacts.ui.contactcreation.model.ContactCreationAction +import com.android.contacts.ui.contactcreation.model.OrganizationFieldState + +internal fun LazyListScope.organizationSection( + organization: OrganizationFieldState, + onAction: (ContactCreationAction) -> Unit, +) { + item(key = "organization_section", contentType = "organization_section") { + OrganizationFields(organization = organization, onAction = onAction) + } +} + +@Composable +internal fun OrganizationFields( + organization: OrganizationFieldState, + onAction: (ContactCreationAction) -> Unit, + modifier: Modifier = Modifier, +) { + Column(modifier = modifier.padding(horizontal = 16.dp)) { + OutlinedTextField( + value = organization.company, + onValueChange = { onAction(ContactCreationAction.UpdateCompany(it)) }, + label = { Text("Company") }, + modifier = Modifier + .fillMaxWidth() + .testTag(TestTags.ORG_COMPANY), + singleLine = true, + ) + OutlinedTextField( + value = organization.title, + onValueChange = { onAction(ContactCreationAction.UpdateJobTitle(it)) }, + label = { Text("Title") }, + modifier = Modifier + .fillMaxWidth() + .testTag(TestTags.ORG_TITLE), + singleLine = true, + ) + } +} diff --git a/src/com/android/contacts/ui/contactcreation/delegate/ContactFieldsDelegate.kt b/src/com/android/contacts/ui/contactcreation/delegate/ContactFieldsDelegate.kt index 394f04f42..ead3103ec 100644 --- a/src/com/android/contacts/ui/contactcreation/delegate/ContactFieldsDelegate.kt +++ b/src/com/android/contacts/ui/contactcreation/delegate/ContactFieldsDelegate.kt @@ -1,9 +1,20 @@ package com.android.contacts.ui.contactcreation.delegate +import com.android.contacts.ui.contactcreation.component.AddressType import com.android.contacts.ui.contactcreation.component.EmailType +import com.android.contacts.ui.contactcreation.component.EventType +import com.android.contacts.ui.contactcreation.component.ImProtocol import com.android.contacts.ui.contactcreation.component.PhoneType +import com.android.contacts.ui.contactcreation.component.RelationType +import com.android.contacts.ui.contactcreation.component.WebsiteType +import com.android.contacts.ui.contactcreation.model.AddressFieldState import com.android.contacts.ui.contactcreation.model.EmailFieldState +import com.android.contacts.ui.contactcreation.model.EventFieldState +import com.android.contacts.ui.contactcreation.model.GroupFieldState +import com.android.contacts.ui.contactcreation.model.ImFieldState import com.android.contacts.ui.contactcreation.model.PhoneFieldState +import com.android.contacts.ui.contactcreation.model.RelationFieldState +import com.android.contacts.ui.contactcreation.model.WebsiteFieldState import javax.inject.Inject import kotlinx.collections.immutable.PersistentList import kotlinx.collections.immutable.persistentListOf @@ -14,10 +25,25 @@ internal class ContactFieldsDelegate @Inject constructor() { private var phones: PersistentList = persistentListOf(PhoneFieldState()) private var emails: PersistentList = persistentListOf(EmailFieldState()) + private var addresses: PersistentList = persistentListOf() + private var events: PersistentList = persistentListOf() + private var relations: PersistentList = persistentListOf() + private var imAccounts: PersistentList = persistentListOf() + private var websites: PersistentList = persistentListOf() + private var groups: PersistentList = persistentListOf() - fun getPhones(): List = phones + // --- Getters --- + fun getPhones(): List = phones fun getEmails(): List = emails + fun getAddresses(): List = addresses + fun getEvents(): List = events + fun getRelations(): List = relations + fun getImAccounts(): List = imAccounts + fun getWebsites(): List = websites + fun getGroups(): List = groups + + // --- Restore --- fun restorePhones(list: List) { phones = list.toPersistentList() @@ -27,6 +53,32 @@ internal class ContactFieldsDelegate @Inject constructor() { emails = list.toPersistentList() } + fun restoreAddresses(list: List) { + addresses = list.toPersistentList() + } + + fun restoreEvents(list: List) { + events = list.toPersistentList() + } + + fun restoreRelations(list: List) { + relations = list.toPersistentList() + } + + fun restoreImAccounts(list: List) { + imAccounts = list.toPersistentList() + } + + fun restoreWebsites(list: List) { + websites = list.toPersistentList() + } + + fun restoreGroups(list: List) { + groups = list.toPersistentList() + } + + // --- Phone --- + fun addPhone(): List { phones = phones.add(PhoneFieldState()) return phones @@ -47,6 +99,8 @@ internal class ContactFieldsDelegate @Inject constructor() { return phones } + // --- Email --- + fun addEmail(): List { emails = emails.add(EmailFieldState()) return emails @@ -66,4 +120,179 @@ internal class ContactFieldsDelegate @Inject constructor() { emails = emails.map { if (it.id == id) it.copy(type = type) else it }.toPersistentList() return emails } + + // --- Address --- + + fun addAddress(): List { + addresses = addresses.add(AddressFieldState()) + return addresses + } + + fun removeAddress(id: String): List { + addresses = addresses.removeAll { it.id == id } + return addresses + } + + fun updateAddressStreet(id: String, value: String): List { + addresses = addresses.map { + if (it.id == id) it.copy(street = value) else it + }.toPersistentList() + return addresses + } + + fun updateAddressCity(id: String, value: String): List { + addresses = addresses.map { + if (it.id == id) it.copy(city = value) else it + }.toPersistentList() + return addresses + } + + fun updateAddressRegion(id: String, value: String): List { + addresses = addresses.map { + if (it.id == id) it.copy(region = value) else it + }.toPersistentList() + return addresses + } + + fun updateAddressPostcode(id: String, value: String): List { + addresses = addresses.map { + if (it.id == id) it.copy(postcode = value) else it + }.toPersistentList() + return addresses + } + + fun updateAddressCountry(id: String, value: String): List { + addresses = addresses.map { + if (it.id == id) it.copy(country = value) else it + }.toPersistentList() + return addresses + } + + fun updateAddressType(id: String, type: AddressType): List { + addresses = addresses.map { + if (it.id == id) it.copy(type = type) else it + }.toPersistentList() + return addresses + } + + // --- Event --- + + fun addEvent(): List { + events = events.add(EventFieldState()) + return events + } + + fun removeEvent(id: String): List { + events = events.removeAll { it.id == id } + return events + } + + fun updateEvent(id: String, value: String): List { + events = events.map { + if (it.id == id) it.copy(startDate = value) else it + }.toPersistentList() + return events + } + + fun updateEventType(id: String, type: EventType): List { + events = events.map { + if (it.id == id) it.copy(type = type) else it + }.toPersistentList() + return events + } + + // --- Relation --- + + fun addRelation(): List { + relations = relations.add(RelationFieldState()) + return relations + } + + fun removeRelation(id: String): List { + relations = relations.removeAll { it.id == id } + return relations + } + + fun updateRelation(id: String, value: String): List { + relations = relations.map { + if (it.id == id) it.copy(name = value) else it + }.toPersistentList() + return relations + } + + fun updateRelationType(id: String, type: RelationType): List { + relations = relations.map { + if (it.id == id) it.copy(type = type) else it + }.toPersistentList() + return relations + } + + // --- IM --- + + fun addIm(): List { + imAccounts = imAccounts.add(ImFieldState()) + return imAccounts + } + + fun removeIm(id: String): List { + imAccounts = imAccounts.removeAll { it.id == id } + return imAccounts + } + + fun updateIm(id: String, value: String): List { + imAccounts = imAccounts.map { + if (it.id == id) it.copy(data = value) else it + }.toPersistentList() + return imAccounts + } + + fun updateImProtocol(id: String, protocol: ImProtocol): List { + imAccounts = imAccounts.map { + if (it.id == id) it.copy(protocol = protocol) else it + }.toPersistentList() + return imAccounts + } + + // --- Website --- + + fun addWebsite(): List { + websites = websites.add(WebsiteFieldState()) + return websites + } + + fun removeWebsite(id: String): List { + websites = websites.removeAll { it.id == id } + return websites + } + + fun updateWebsite(id: String, value: String): List { + websites = websites.map { + if (it.id == id) it.copy(url = value) else it + }.toPersistentList() + return websites + } + + fun updateWebsiteType(id: String, type: WebsiteType): List { + websites = websites.map { + if (it.id == id) it.copy(type = type) else it + }.toPersistentList() + return websites + } + + // --- Group --- + + fun toggleGroup(groupId: Long, title: String): List { + val existing = groups.find { it.groupId == groupId } + groups = if (existing != null) { + groups.removeAll { it.groupId == groupId } + } else { + groups.add(GroupFieldState(groupId = groupId, title = title)) + } + return groups + } + + fun clearGroups(): List { + groups = persistentListOf() + return groups + } } diff --git a/src/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapper.kt b/src/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapper.kt index 07940b1cc..6b8a522ab 100644 --- a/src/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapper.kt +++ b/src/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapper.kt @@ -3,21 +3,37 @@ package com.android.contacts.ui.contactcreation.mapper import android.content.ContentValues import android.os.Bundle import android.provider.ContactsContract.CommonDataKinds.Email +import android.provider.ContactsContract.CommonDataKinds.Event +import android.provider.ContactsContract.CommonDataKinds.GroupMembership +import android.provider.ContactsContract.CommonDataKinds.Im +import android.provider.ContactsContract.CommonDataKinds.Nickname +import android.provider.ContactsContract.CommonDataKinds.Note +import android.provider.ContactsContract.CommonDataKinds.Organization import android.provider.ContactsContract.CommonDataKinds.Phone +import android.provider.ContactsContract.CommonDataKinds.Relation +import android.provider.ContactsContract.CommonDataKinds.SipAddress import android.provider.ContactsContract.CommonDataKinds.StructuredName +import android.provider.ContactsContract.CommonDataKinds.StructuredPostal +import android.provider.ContactsContract.CommonDataKinds.Website import android.provider.ContactsContract.Data import com.android.contacts.model.RawContact import com.android.contacts.model.RawContactDelta import com.android.contacts.model.RawContactDeltaList import com.android.contacts.model.ValuesDelta import com.android.contacts.model.account.AccountWithDataSet +import com.android.contacts.ui.contactcreation.component.AddressType import com.android.contacts.ui.contactcreation.component.EmailType +import com.android.contacts.ui.contactcreation.component.EventType +import com.android.contacts.ui.contactcreation.component.ImProtocol import com.android.contacts.ui.contactcreation.component.PhoneType +import com.android.contacts.ui.contactcreation.component.RelationType +import com.android.contacts.ui.contactcreation.component.WebsiteType import com.android.contacts.ui.contactcreation.model.ContactCreationUiState import javax.inject.Inject internal data class DeltaMapperResult(val state: RawContactDeltaList, val updatedPhotos: Bundle) +@Suppress("TooManyFunctions") internal class RawContactDeltaMapper @Inject constructor() { fun map( @@ -33,6 +49,16 @@ internal class RawContactDeltaMapper @Inject constructor() { mapName(delta, uiState) mapPhones(delta, uiState) mapEmails(delta, uiState) + mapAddresses(delta, uiState) + mapOrganization(delta, uiState) + mapEvents(delta, uiState) + mapRelations(delta, uiState) + mapImAccounts(delta, uiState) + mapWebsites(delta, uiState) + mapNote(delta, uiState) + mapNickname(delta, uiState) + mapSipAddress(delta, uiState) + mapGroups(delta, uiState) mapPhoto(delta, uiState, updatedPhotos) val state = RawContactDeltaList().apply { add(delta) } @@ -90,6 +116,154 @@ internal class RawContactDeltaMapper @Inject constructor() { } } + private fun mapAddresses(delta: RawContactDelta, uiState: ContactCreationUiState) { + for (address in uiState.addresses) { + if (!address.hasData()) continue + delta.addEntry( + ValuesDelta.fromAfter( + contentValues(StructuredPostal.CONTENT_ITEM_TYPE) { + putIfNotBlank(StructuredPostal.STREET, address.street) + putIfNotBlank(StructuredPostal.CITY, address.city) + putIfNotBlank(StructuredPostal.REGION, address.region) + putIfNotBlank(StructuredPostal.POSTCODE, address.postcode) + putIfNotBlank(StructuredPostal.COUNTRY, address.country) + put(StructuredPostal.TYPE, address.type.rawValue) + if (address.type is AddressType.Custom) { + put(StructuredPostal.LABEL, address.type.label) + } + }, + ), + ) + } + } + + private fun mapOrganization(delta: RawContactDelta, uiState: ContactCreationUiState) { + val org = uiState.organization + if (!org.hasData()) return + + delta.addEntry( + ValuesDelta.fromAfter( + contentValues(Organization.CONTENT_ITEM_TYPE) { + putIfNotBlank(Organization.COMPANY, org.company) + putIfNotBlank(Organization.TITLE, org.title) + }, + ), + ) + } + + private fun mapEvents(delta: RawContactDelta, uiState: ContactCreationUiState) { + for (event in uiState.events) { + if (event.startDate.isBlank()) continue + delta.addEntry( + ValuesDelta.fromAfter( + contentValues(Event.CONTENT_ITEM_TYPE) { + put(Event.START_DATE, event.startDate) + put(Event.TYPE, event.type.rawValue) + if (event.type is EventType.Custom) { + put(Event.LABEL, event.type.label) + } + }, + ), + ) + } + } + + private fun mapRelations(delta: RawContactDelta, uiState: ContactCreationUiState) { + for (relation in uiState.relations) { + if (relation.name.isBlank()) continue + delta.addEntry( + ValuesDelta.fromAfter( + contentValues(Relation.CONTENT_ITEM_TYPE) { + put(Relation.NAME, relation.name) + put(Relation.TYPE, relation.type.rawValue) + if (relation.type is RelationType.Custom) { + put(Relation.LABEL, relation.type.label) + } + }, + ), + ) + } + } + + private fun mapImAccounts(delta: RawContactDelta, uiState: ContactCreationUiState) { + for (im in uiState.imAccounts) { + if (im.data.isBlank()) continue + delta.addEntry( + ValuesDelta.fromAfter( + contentValues(Im.CONTENT_ITEM_TYPE) { + put(Im.DATA, im.data) + put(Im.PROTOCOL, im.protocol.rawValue) + if (im.protocol is ImProtocol.Custom) { + put(Im.CUSTOM_PROTOCOL, im.protocol.label) + } + }, + ), + ) + } + } + + private fun mapWebsites(delta: RawContactDelta, uiState: ContactCreationUiState) { + for (website in uiState.websites) { + if (website.url.isBlank()) continue + delta.addEntry( + ValuesDelta.fromAfter( + contentValues(Website.CONTENT_ITEM_TYPE) { + put(Website.URL, website.url) + put(Website.TYPE, website.type.rawValue) + if (website.type is WebsiteType.Custom) { + put(Website.LABEL, website.type.label) + } + }, + ), + ) + } + } + + private fun mapNote(delta: RawContactDelta, uiState: ContactCreationUiState) { + if (uiState.note.isBlank()) return + delta.addEntry( + ValuesDelta.fromAfter( + contentValues(Note.CONTENT_ITEM_TYPE) { + put(Note.NOTE, uiState.note) + }, + ), + ) + } + + private fun mapNickname(delta: RawContactDelta, uiState: ContactCreationUiState) { + if (uiState.nickname.isBlank()) return + delta.addEntry( + ValuesDelta.fromAfter( + contentValues(Nickname.CONTENT_ITEM_TYPE) { + put(Nickname.NAME, uiState.nickname) + }, + ), + ) + } + + private fun mapSipAddress(delta: RawContactDelta, uiState: ContactCreationUiState) { + if (uiState.sipAddress.isBlank()) return + delta.addEntry( + ValuesDelta.fromAfter( + contentValues(SipAddress.CONTENT_ITEM_TYPE) { + put(SipAddress.SIP_ADDRESS, uiState.sipAddress) + }, + ), + ) + } + + private fun mapGroups(delta: RawContactDelta, uiState: ContactCreationUiState) { + for (group in uiState.groups) { + delta.addEntry( + ValuesDelta.fromAfter( + contentValues(GroupMembership.CONTENT_ITEM_TYPE) { + put(GroupMembership.GROUP_ROW_ID, group.groupId) + }, + ), + ) + } + } + private fun mapPhoto( delta: RawContactDelta, uiState: ContactCreationUiState, diff --git a/src/com/android/contacts/ui/contactcreation/model/ContactCreationAction.kt b/src/com/android/contacts/ui/contactcreation/model/ContactCreationAction.kt index 9e68ebd40..7a1cb49c7 100644 --- a/src/com/android/contacts/ui/contactcreation/model/ContactCreationAction.kt +++ b/src/com/android/contacts/ui/contactcreation/model/ContactCreationAction.kt @@ -2,9 +2,15 @@ package com.android.contacts.ui.contactcreation.model import android.net.Uri import com.android.contacts.model.account.AccountWithDataSet +import com.android.contacts.ui.contactcreation.component.AddressType import com.android.contacts.ui.contactcreation.component.EmailType +import com.android.contacts.ui.contactcreation.component.EventType +import com.android.contacts.ui.contactcreation.component.ImProtocol import com.android.contacts.ui.contactcreation.component.PhoneType +import com.android.contacts.ui.contactcreation.component.RelationType +import com.android.contacts.ui.contactcreation.component.WebsiteType +@Suppress("TooManyFunctions") internal sealed interface ContactCreationAction { // Navigation data object NavigateBack : ContactCreationAction @@ -30,6 +36,59 @@ internal sealed interface ContactCreationAction { data class UpdateEmail(val id: String, val value: String) : ContactCreationAction data class UpdateEmailType(val id: String, val type: EmailType) : ContactCreationAction + // Address + data object AddAddress : ContactCreationAction + data class RemoveAddress(val id: String) : ContactCreationAction + data class UpdateAddressStreet(val id: String, val value: String) : ContactCreationAction + data class UpdateAddressCity(val id: String, val value: String) : ContactCreationAction + data class UpdateAddressRegion(val id: String, val value: String) : ContactCreationAction + data class UpdateAddressPostcode(val id: String, val value: String) : ContactCreationAction + data class UpdateAddressCountry(val id: String, val value: String) : ContactCreationAction + data class UpdateAddressType(val id: String, val type: AddressType) : ContactCreationAction + + // Organization + data class UpdateCompany(val value: String) : ContactCreationAction + data class UpdateJobTitle(val value: String) : ContactCreationAction + + // Event + data object AddEvent : ContactCreationAction + data class RemoveEvent(val id: String) : ContactCreationAction + data class UpdateEvent(val id: String, val value: String) : ContactCreationAction + data class UpdateEventType(val id: String, val type: EventType) : ContactCreationAction + + // Relation + data object AddRelation : ContactCreationAction + data class RemoveRelation(val id: String) : ContactCreationAction + data class UpdateRelation(val id: String, val value: String) : ContactCreationAction + data class UpdateRelationType(val id: String, val type: RelationType) : ContactCreationAction + + // IM + data object AddIm : ContactCreationAction + data class RemoveIm(val id: String) : ContactCreationAction + data class UpdateIm(val id: String, val value: String) : ContactCreationAction + data class UpdateImProtocol(val id: String, val protocol: ImProtocol) : ContactCreationAction + + // Website + data object AddWebsite : ContactCreationAction + data class RemoveWebsite(val id: String) : ContactCreationAction + data class UpdateWebsite(val id: String, val value: String) : ContactCreationAction + data class UpdateWebsiteType(val id: String, val type: WebsiteType) : ContactCreationAction + + // Note + data class UpdateNote(val value: String) : ContactCreationAction + + // Nickname + data class UpdateNickname(val value: String) : ContactCreationAction + + // SIP + data class UpdateSipAddress(val value: String) : ContactCreationAction + + // Groups + data class ToggleGroup(val groupId: Long, val title: String) : ContactCreationAction + + // More fields + data object ToggleMoreFields : ContactCreationAction + // Photo data class SetPhoto(val uri: Uri) : ContactCreationAction data object RemovePhoto : ContactCreationAction diff --git a/src/com/android/contacts/ui/contactcreation/model/ContactCreationUiState.kt b/src/com/android/contacts/ui/contactcreation/model/ContactCreationUiState.kt index 0613e68e6..63f75a9fc 100644 --- a/src/com/android/contacts/ui/contactcreation/model/ContactCreationUiState.kt +++ b/src/com/android/contacts/ui/contactcreation/model/ContactCreationUiState.kt @@ -4,8 +4,13 @@ import android.net.Uri import android.os.Parcelable import androidx.compose.runtime.Immutable import com.android.contacts.model.account.AccountWithDataSet +import com.android.contacts.ui.contactcreation.component.AddressType import com.android.contacts.ui.contactcreation.component.EmailType +import com.android.contacts.ui.contactcreation.component.EventType +import com.android.contacts.ui.contactcreation.component.ImProtocol import com.android.contacts.ui.contactcreation.component.PhoneType +import com.android.contacts.ui.contactcreation.component.RelationType +import com.android.contacts.ui.contactcreation.component.WebsiteType import java.util.UUID import kotlinx.parcelize.Parcelize @@ -15,15 +20,39 @@ internal data class ContactCreationUiState( val nameState: NameState = NameState(), val phoneNumbers: List = listOf(PhoneFieldState()), val emails: List = listOf(EmailFieldState()), + val addresses: List = emptyList(), + val organization: OrganizationFieldState = OrganizationFieldState(), + val events: List = emptyList(), + val relations: List = emptyList(), + val imAccounts: List = emptyList(), + val websites: List = emptyList(), + val note: String = "", + val nickname: String = "", + val sipAddress: String = "", + val groups: List = emptyList(), + val availableGroups: List = emptyList(), val photoUri: Uri? = null, val selectedAccount: AccountWithDataSet? = null, val accountName: String? = null, val isSaving: Boolean = false, + val isMoreFieldsExpanded: Boolean = false, + val showSipField: Boolean = true, ) : Parcelable { + @Suppress("CyclomaticComplexMethod") fun hasPendingChanges(): Boolean = nameState.hasData() || phoneNumbers.any { it.number.isNotBlank() } || emails.any { it.address.isNotBlank() } || + addresses.any { it.hasData() } || + organization.hasData() || + events.any { it.startDate.isNotBlank() } || + relations.any { it.name.isNotBlank() } || + imAccounts.any { it.data.isNotBlank() } || + websites.any { it.url.isNotBlank() } || + note.isNotBlank() || + nickname.isNotBlank() || + sipAddress.isNotBlank() || + groups.isNotEmpty() || photoUri != null } @@ -40,3 +69,58 @@ internal data class EmailFieldState( val address: String = "", val type: EmailType = EmailType.Home, ) : Parcelable + +@Parcelize +internal data class AddressFieldState( + val id: String = UUID.randomUUID().toString(), + val street: String = "", + val city: String = "", + val region: String = "", + val postcode: String = "", + val country: String = "", + val type: AddressType = AddressType.Home, +) : Parcelable { + fun hasData(): Boolean = + street.isNotBlank() || city.isNotBlank() || region.isNotBlank() || + postcode.isNotBlank() || country.isNotBlank() +} + +@Parcelize +internal data class OrganizationFieldState(val company: String = "", val title: String = "") : + Parcelable { + fun hasData(): Boolean = company.isNotBlank() || title.isNotBlank() +} + +@Parcelize +internal data class EventFieldState( + val id: String = UUID.randomUUID().toString(), + val startDate: String = "", + val type: EventType = EventType.Birthday, +) : Parcelable + +@Parcelize +internal data class RelationFieldState( + val id: String = UUID.randomUUID().toString(), + val name: String = "", + val type: RelationType = RelationType.Spouse, +) : Parcelable + +@Parcelize +internal data class ImFieldState( + val id: String = UUID.randomUUID().toString(), + val data: String = "", + val protocol: ImProtocol = ImProtocol.Jabber, +) : Parcelable + +@Parcelize +internal data class WebsiteFieldState( + val id: String = UUID.randomUUID().toString(), + val url: String = "", + val type: WebsiteType = WebsiteType.Homepage, +) : Parcelable + +@Parcelize +internal data class GroupFieldState(val groupId: Long, val title: String) : Parcelable + +@Parcelize +internal data class GroupInfo(val groupId: Long, val title: String) : Parcelable From 97a8e6915730b744761030923ff96b6b4e3f45c3 Mon Sep 17 00:00:00 2001 From: nrobi144 Date: Tue, 14 Apr 2026 15:09:59 +0300 Subject: [PATCH 27/29] =?UTF-8?q?feat(contacts):=20Phase=203=20=E2=80=94?= =?UTF-8?q?=20photo=20support=20with=20Coil,=20gallery,=20camera?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SDD: mapper + VM tests expanded first (107 unit tests), then implementation. - Add PhotoSection with tappable avatar, dropdown menu (gallery/camera/remove) - Coil AsyncImage for off-thread photo display with downsampling - PickVisualMedia for gallery, ACTION_IMAGE_CAPTURE for camera - Photo URI passed to save service via EXTRA_UPDATED_PHOTOS bundle - Temp files in getCacheDir()/contact_photos/ subdirectory - Temp file cleanup in ViewModel.onCleared() - FileProvider scoped to contact_photos/ path only - 42 mapper tests, 19 VM tests, 8 photo section androidTests Co-Authored-By: Claude Opus 4.6 (1M context) --- .../component/PhotoSectionTest.kt | 103 +++++++++++ .../ContactCreationViewModelTest.kt | 30 ++++ .../mapper/RawContactDeltaMapperTest.kt | 28 +++ res/xml/file_paths.xml | 4 +- .../ContactCreationEditorScreen.kt | 2 + .../ContactCreationViewModel.kt | 43 +++++ .../contacts/ui/contactcreation/TestTags.kt | 5 + .../contactcreation/component/PhotoSection.kt | 170 ++++++++++++++++++ .../model/ContactCreationAction.kt | 2 + .../model/ContactCreationEffect.kt | 2 + 10 files changed, 387 insertions(+), 2 deletions(-) create mode 100644 app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/PhotoSectionTest.kt create mode 100644 src/com/android/contacts/ui/contactcreation/component/PhotoSection.kt diff --git a/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/PhotoSectionTest.kt b/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/PhotoSectionTest.kt new file mode 100644 index 000000000..32102e115 --- /dev/null +++ b/app/src/androidTest/java/com/android/contacts/ui/contactcreation/component/PhotoSectionTest.kt @@ -0,0 +1,103 @@ +package com.android.contacts.ui.contactcreation.component + +import android.net.Uri +import androidx.activity.ComponentActivity +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.junit4.createAndroidComposeRule +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.test.performClick +import com.android.contacts.ui.contactcreation.TestTags +import com.android.contacts.ui.contactcreation.model.ContactCreationAction +import com.android.contacts.ui.core.AppTheme +import kotlin.test.assertIs +import org.junit.Assert.assertEquals +import org.junit.Before +import org.junit.Rule +import org.junit.Test + +class PhotoSectionTest { + + @get:Rule + val composeTestRule = createAndroidComposeRule() + + private val capturedActions = mutableListOf() + + @Before + fun setup() { + capturedActions.clear() + } + + @Test + fun noPhoto_showsPlaceholderIcon() { + setContent(photoUri = null) + composeTestRule.onNodeWithTag(TestTags.PHOTO_PLACEHOLDER_ICON).assertIsDisplayed() + } + + @Test + fun withPhoto_showsAvatar() { + setContent(photoUri = Uri.parse("content://media/external/images/1234")) + composeTestRule.onNodeWithTag(TestTags.PHOTO_AVATAR).assertIsDisplayed() + } + + @Test + fun tapAvatar_showsDropdownMenu() { + setContent(photoUri = null) + composeTestRule.onNodeWithTag(TestTags.PHOTO_AVATAR).performClick() + composeTestRule.onNodeWithTag(TestTags.PHOTO_PICK_GALLERY).assertIsDisplayed() + composeTestRule.onNodeWithTag(TestTags.PHOTO_TAKE_CAMERA).assertIsDisplayed() + } + + @Test + fun tapAvatar_withPhoto_showsRemoveOption() { + setContent(photoUri = Uri.parse("content://media/external/images/1234")) + composeTestRule.onNodeWithTag(TestTags.PHOTO_AVATAR).performClick() + composeTestRule.onNodeWithTag(TestTags.PHOTO_REMOVE).assertIsDisplayed() + } + + @Test + fun tapAvatar_withoutPhoto_noRemoveOption() { + setContent(photoUri = null) + composeTestRule.onNodeWithTag(TestTags.PHOTO_AVATAR).performClick() + composeTestRule.onNodeWithTag(TestTags.PHOTO_REMOVE).assertDoesNotExist() + } + + @Test + fun tapGallery_dispatchesRequestGalleryEffect() { + setContent(photoUri = null) + composeTestRule.onNodeWithTag(TestTags.PHOTO_AVATAR).performClick() + composeTestRule.onNodeWithTag(TestTags.PHOTO_PICK_GALLERY).performClick() + assertEquals(1, capturedActions.size) + assertIs(capturedActions.last()) + } + + @Test + fun tapCamera_dispatchesRequestCameraEffect() { + setContent(photoUri = null) + composeTestRule.onNodeWithTag(TestTags.PHOTO_AVATAR).performClick() + composeTestRule.onNodeWithTag(TestTags.PHOTO_TAKE_CAMERA).performClick() + assertEquals(1, capturedActions.size) + assertIs(capturedActions.last()) + } + + @Test + fun tapRemove_dispatchesRemovePhoto() { + setContent(photoUri = Uri.parse("content://media/external/images/1234")) + composeTestRule.onNodeWithTag(TestTags.PHOTO_AVATAR).performClick() + composeTestRule.onNodeWithTag(TestTags.PHOTO_REMOVE).performClick() + assertEquals(ContactCreationAction.RemovePhoto, capturedActions.last()) + } + + private fun setContent(photoUri: Uri? = null) { + composeTestRule.setContent { + AppTheme { + LazyColumn { + photoSection( + photoUri = photoUri, + onAction = { capturedActions.add(it) }, + ) + } + } + } + } +} diff --git a/app/src/test/java/com/android/contacts/ui/contactcreation/ContactCreationViewModelTest.kt b/app/src/test/java/com/android/contacts/ui/contactcreation/ContactCreationViewModelTest.kt index 5d4a7a83c..1b878a56e 100644 --- a/app/src/test/java/com/android/contacts/ui/contactcreation/ContactCreationViewModelTest.kt +++ b/app/src/test/java/com/android/contacts/ui/contactcreation/ContactCreationViewModelTest.kt @@ -15,11 +15,13 @@ import kotlin.test.assertIs import kotlinx.coroutines.test.runTest import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment @RunWith(RobolectricTestRunner::class) class ContactCreationViewModelTest { @@ -181,6 +183,33 @@ class ContactCreationViewModelTest { assertEquals("555", vm.uiState.value.phoneNumbers[0].number) } + // --- Photo --- + + @Test + fun setPhoto_updatesPhotoUri() { + val vm = createViewModel() + val uri = Uri.parse("content://media/external/images/1234") + vm.onAction(ContactCreationAction.SetPhoto(uri)) + assertEquals(uri, vm.uiState.value.photoUri) + } + + @Test + fun removePhoto_clearsPhotoUri() { + val vm = createViewModel() + val uri = Uri.parse("content://media/external/images/1234") + vm.onAction(ContactCreationAction.SetPhoto(uri)) + vm.onAction(ContactCreationAction.RemovePhoto) + assertNull(vm.uiState.value.photoUri) + } + + @Test + fun setPhoto_countsAsPendingChange() { + val vm = createViewModel() + val uri = Uri.parse("content://media/external/images/1234") + vm.onAction(ContactCreationAction.SetPhoto(uri)) + assertTrue(vm.uiState.value.hasPendingChanges()) + } + @Test fun saveAction_setsIsSaving() = runTest(mainDispatcherRule.testDispatcher) { @@ -205,6 +234,7 @@ class ContactCreationViewModelTest { fieldsDelegate = ContactFieldsDelegate(), deltaMapper = RawContactDeltaMapper(), defaultDispatcher = mainDispatcherRule.testDispatcher, + appContext = RuntimeEnvironment.getApplication(), ) } } diff --git a/app/src/test/java/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapperTest.kt b/app/src/test/java/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapperTest.kt index d49917ca9..d886f0c14 100644 --- a/app/src/test/java/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapperTest.kt +++ b/app/src/test/java/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapperTest.kt @@ -1,5 +1,6 @@ package com.android.contacts.ui.contactcreation.mapper +import android.net.Uri import android.provider.ContactsContract.CommonDataKinds.Email import android.provider.ContactsContract.CommonDataKinds.Event import android.provider.ContactsContract.CommonDataKinds.GroupMembership @@ -615,6 +616,33 @@ class RawContactDeltaMapperTest { assertEquals(1, result.state[0].getMimeEntries(Email.CONTENT_ITEM_TYPE)!!.size) } + // --- Photo --- + + @Test + fun photoUri_inUpdatedPhotosBundle() { + val photoUri = Uri.parse("content://media/external/images/1234") + val state = ContactCreationUiState( + nameState = NameState(first = "Photo"), + photoUri = photoUri, + ) + val result = mapper.map(state, account = null) + val tempId = result.state[0].values.id.toString() + val bundledUri = result.updatedPhotos.getParcelable(tempId) + + assertEquals(photoUri, bundledUri) + } + + @Test + fun nullPhotoUri_emptyUpdatedPhotosBundle() { + val state = ContactCreationUiState( + nameState = NameState(first = "NoPhoto"), + photoUri = null, + ) + val result = mapper.map(state, account = null) + + assertTrue(result.updatedPhotos.isEmpty) + } + @Test fun multipleAddresses_producesMultipleEntries() { val state = ContactCreationUiState( diff --git a/res/xml/file_paths.xml b/res/xml/file_paths.xml index 294c0cbfc..449ebc03a 100644 --- a/res/xml/file_paths.xml +++ b/res/xml/file_paths.xml @@ -15,6 +15,6 @@ --> - - + + diff --git a/src/com/android/contacts/ui/contactcreation/ContactCreationEditorScreen.kt b/src/com/android/contacts/ui/contactcreation/ContactCreationEditorScreen.kt index d73cf5b9c..efd91d372 100644 --- a/src/com/android/contacts/ui/contactcreation/ContactCreationEditorScreen.kt +++ b/src/com/android/contacts/ui/contactcreation/ContactCreationEditorScreen.kt @@ -27,6 +27,7 @@ import com.android.contacts.ui.contactcreation.component.moreFieldsSection import com.android.contacts.ui.contactcreation.component.nameSection import com.android.contacts.ui.contactcreation.component.organizationSection import com.android.contacts.ui.contactcreation.component.phoneSection +import com.android.contacts.ui.contactcreation.component.photoSection import com.android.contacts.ui.contactcreation.model.ContactCreationAction import com.android.contacts.ui.contactcreation.model.ContactCreationUiState @@ -82,6 +83,7 @@ private fun ContactCreationFieldsList( modifier = Modifier.fillMaxSize(), contentPadding = contentPadding, ) { + photoSection(photoUri = uiState.photoUri, onAction = onAction) accountChipItem(accountName = uiState.accountName, onAction = onAction) nameSection(nameState = uiState.nameState, onAction = onAction) phoneSection(phones = uiState.phoneNumbers, onAction = onAction) diff --git a/src/com/android/contacts/ui/contactcreation/ContactCreationViewModel.kt b/src/com/android/contacts/ui/contactcreation/ContactCreationViewModel.kt index 881340ef6..6e22d21cf 100644 --- a/src/com/android/contacts/ui/contactcreation/ContactCreationViewModel.kt +++ b/src/com/android/contacts/ui/contactcreation/ContactCreationViewModel.kt @@ -1,6 +1,8 @@ package com.android.contacts.ui.contactcreation +import android.content.Context import android.net.Uri +import androidx.core.content.FileProvider import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -13,6 +15,9 @@ import com.android.contacts.ui.contactcreation.model.ContactCreationEffect import com.android.contacts.ui.contactcreation.model.ContactCreationUiState import com.android.contacts.ui.contactcreation.model.NameState import dagger.hilt.android.lifecycle.HiltViewModel +import dagger.hilt.android.qualifiers.ApplicationContext +import java.io.File +import java.util.UUID import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.channels.Channel @@ -28,12 +33,14 @@ import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch +@Suppress("TooManyFunctions") @HiltViewModel internal class ContactCreationViewModel @Inject constructor( private val savedStateHandle: SavedStateHandle, private val fieldsDelegate: ContactFieldsDelegate, private val deltaMapper: RawContactDeltaMapper, @DefaultDispatcher private val defaultDispatcher: CoroutineDispatcher, + @ApplicationContext private val appContext: Context, ) : ViewModel() { private val _uiState = MutableStateFlow( @@ -230,6 +237,9 @@ internal class ContactCreationViewModel @Inject constructor( updateState { copy(photoUri = action.uri) } is ContactCreationAction.RemovePhoto -> updateState { copy(photoUri = null) } + is ContactCreationAction.RequestGallery -> + viewModelScope.launch { _effects.send(ContactCreationEffect.LaunchGallery) } + is ContactCreationAction.RequestCamera -> requestCamera() // Account is ContactCreationAction.SelectAccount -> @@ -281,6 +291,38 @@ internal class ContactCreationViewModel @Inject constructor( } } + private fun requestCamera() { + viewModelScope.launch(defaultDispatcher) { + val photoDir = File(appContext.cacheDir, PHOTO_CACHE_DIR).apply { mkdirs() } + val photoFile = File(photoDir, "photo_${UUID.randomUUID()}.jpg") + val authority = appContext.getString(R.string.contacts_file_provider_authority) + val uri = FileProvider.getUriForFile(appContext, authority, photoFile) + pendingCameraUri = uri + _effects.send(ContactCreationEffect.LaunchCamera(uri)) + } + } + + /** URI of the file passed to ACTION_IMAGE_CAPTURE, awaiting result. */ + private var pendingCameraUri: Uri? = null + + fun getPendingCameraUri(): Uri? = pendingCameraUri + + fun clearPendingCameraUri() { + pendingCameraUri = null + } + + override fun onCleared() { + super.onCleared() + cleanupTempPhotos() + } + + private fun cleanupTempPhotos() { + val photoDir = File(appContext.cacheDir, PHOTO_CACHE_DIR) + if (photoDir.exists()) { + photoDir.listFiles()?.forEach { it.delete() } + } + } + private inline fun updateName(crossinline transform: NameState.() -> NameState) { _uiState.update { it.copy(nameState = it.nameState.transform()) } } @@ -295,5 +337,6 @@ internal class ContactCreationViewModel @Inject constructor( const val STATE_KEY = "state" const val SAVE_COMPLETED_ACTION = "com.android.contacts.SAVE_COMPLETED" private const val STOP_TIMEOUT = 5_000L + private const val PHOTO_CACHE_DIR = "contact_photos" } } diff --git a/src/com/android/contacts/ui/contactcreation/TestTags.kt b/src/com/android/contacts/ui/contactcreation/TestTags.kt index d051a25e6..6596f9f77 100644 --- a/src/com/android/contacts/ui/contactcreation/TestTags.kt +++ b/src/com/android/contacts/ui/contactcreation/TestTags.kt @@ -85,4 +85,9 @@ internal object TestTags { // Photo const val PHOTO_AVATAR = "contact_creation_photo_avatar" + const val PHOTO_MENU = "contact_creation_photo_menu" + const val PHOTO_PICK_GALLERY = "contact_creation_photo_pick_gallery" + const val PHOTO_TAKE_CAMERA = "contact_creation_photo_take_camera" + const val PHOTO_REMOVE = "contact_creation_photo_remove" + const val PHOTO_PLACEHOLDER_ICON = "contact_creation_photo_placeholder_icon" } diff --git a/src/com/android/contacts/ui/contactcreation/component/PhotoSection.kt b/src/com/android/contacts/ui/contactcreation/component/PhotoSection.kt new file mode 100644 index 000000000..e58e01ed9 --- /dev/null +++ b/src/com/android/contacts/ui/contactcreation/component/PhotoSection.kt @@ -0,0 +1,170 @@ +package com.android.contacts.ui.contactcreation.component + +import android.net.Uri +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyListScope +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.CameraAlt +import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.filled.Person +import androidx.compose.material.icons.filled.PhotoLibrary +import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.unit.dp +import coil3.compose.AsyncImage +import coil3.request.ImageRequest +import coil3.request.crossfade +import coil3.size.Size +import com.android.contacts.ui.contactcreation.TestTags +import com.android.contacts.ui.contactcreation.model.ContactCreationAction + +private const val AVATAR_SIZE_DP = 96 +private const val PHOTO_DOWNSAMPLE_PX = 288 // 96dp * 3 (xxxhdpi) +private const val PLACEHOLDER_ICON_SIZE_DP = 48 + +internal fun LazyListScope.photoSection( + photoUri: Uri?, + onAction: (ContactCreationAction) -> Unit, +) { + item(key = "photo_avatar", contentType = "photo_avatar") { + PhotoAvatar( + photoUri = photoUri, + onAction = onAction, + modifier = Modifier + .fillMaxWidth() + .padding(vertical = 16.dp), + ) + } +} + +@Composable +internal fun PhotoAvatar( + photoUri: Uri?, + onAction: (ContactCreationAction) -> Unit, + modifier: Modifier = Modifier, +) { + var menuExpanded by remember { mutableStateOf(false) } + + Box(modifier = modifier, contentAlignment = Alignment.Center) { + Box { + AvatarSurface(photoUri = photoUri, onClick = { menuExpanded = true }) + PhotoDropdownMenu( + expanded = menuExpanded, + hasPhoto = photoUri != null, + onDismiss = { menuExpanded = false }, + onAction = onAction, + ) + } + } +} + +@Composable +private fun AvatarSurface(photoUri: Uri?, onClick: () -> Unit) { + Surface( + modifier = Modifier + .size(AVATAR_SIZE_DP.dp) + .clip(CircleShape) + .testTag(TestTags.PHOTO_AVATAR) + .clickable(onClick = onClick), + shape = CircleShape, + color = MaterialTheme.colorScheme.surfaceVariant, + ) { + if (photoUri != null) { + PhotoImage(photoUri) + } else { + PlaceholderIcon() + } + } +} + +@Composable +private fun PhotoImage(photoUri: Uri) { + AsyncImage( + model = ImageRequest.Builder(LocalContext.current) + .data(photoUri) + .size(Size(PHOTO_DOWNSAMPLE_PX, PHOTO_DOWNSAMPLE_PX)) + .crossfade(true) + .build(), + contentDescription = "Contact photo", + contentScale = ContentScale.Crop, + modifier = Modifier.size(AVATAR_SIZE_DP.dp), + ) +} + +@Composable +private fun PlaceholderIcon() { + Box(contentAlignment = Alignment.Center, modifier = Modifier.size(AVATAR_SIZE_DP.dp)) { + Icon( + imageVector = Icons.Filled.Person, + contentDescription = "Add photo", + modifier = Modifier + .size(PLACEHOLDER_ICON_SIZE_DP.dp) + .testTag(TestTags.PHOTO_PLACEHOLDER_ICON), + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } +} + +@Composable +private fun PhotoDropdownMenu( + expanded: Boolean, + hasPhoto: Boolean, + onDismiss: () -> Unit, + onAction: (ContactCreationAction) -> Unit, +) { + DropdownMenu( + expanded = expanded, + onDismissRequest = onDismiss, + modifier = Modifier.testTag(TestTags.PHOTO_MENU), + ) { + DropdownMenuItem( + text = { Text("Choose photo") }, + onClick = { + onDismiss() + onAction(ContactCreationAction.RequestGallery) + }, + leadingIcon = { Icon(Icons.Filled.PhotoLibrary, contentDescription = null) }, + modifier = Modifier.testTag(TestTags.PHOTO_PICK_GALLERY), + ) + DropdownMenuItem( + text = { Text("Take photo") }, + onClick = { + onDismiss() + onAction(ContactCreationAction.RequestCamera) + }, + leadingIcon = { Icon(Icons.Filled.CameraAlt, contentDescription = null) }, + modifier = Modifier.testTag(TestTags.PHOTO_TAKE_CAMERA), + ) + if (hasPhoto) { + DropdownMenuItem( + text = { Text("Remove photo") }, + onClick = { + onDismiss() + onAction(ContactCreationAction.RemovePhoto) + }, + leadingIcon = { Icon(Icons.Filled.Close, contentDescription = null) }, + modifier = Modifier.testTag(TestTags.PHOTO_REMOVE), + ) + } + } +} diff --git a/src/com/android/contacts/ui/contactcreation/model/ContactCreationAction.kt b/src/com/android/contacts/ui/contactcreation/model/ContactCreationAction.kt index 7a1cb49c7..643155c57 100644 --- a/src/com/android/contacts/ui/contactcreation/model/ContactCreationAction.kt +++ b/src/com/android/contacts/ui/contactcreation/model/ContactCreationAction.kt @@ -92,6 +92,8 @@ internal sealed interface ContactCreationAction { // Photo data class SetPhoto(val uri: Uri) : ContactCreationAction data object RemovePhoto : ContactCreationAction + data object RequestGallery : ContactCreationAction + data object RequestCamera : ContactCreationAction // Account data class SelectAccount(val account: AccountWithDataSet) : ContactCreationAction diff --git a/src/com/android/contacts/ui/contactcreation/model/ContactCreationEffect.kt b/src/com/android/contacts/ui/contactcreation/model/ContactCreationEffect.kt index 282a8034d..ca57ed860 100644 --- a/src/com/android/contacts/ui/contactcreation/model/ContactCreationEffect.kt +++ b/src/com/android/contacts/ui/contactcreation/model/ContactCreationEffect.kt @@ -9,4 +9,6 @@ internal sealed interface ContactCreationEffect { data class ShowError(val messageResId: Int) : ContactCreationEffect data object ShowDiscardDialog : ContactCreationEffect data object NavigateBack : ContactCreationEffect + data object LaunchGallery : ContactCreationEffect + data class LaunchCamera(val outputUri: Uri) : ContactCreationEffect } From 93cf1f38897a72efda54633bdd31faa8c57db2b0 Mon Sep 17 00:00:00 2001 From: nrobi144 Date: Tue, 14 Apr 2026 15:38:57 +0300 Subject: [PATCH 28/29] =?UTF-8?q?feat(contacts):=20Phase=204=20=E2=80=94?= =?UTF-8?q?=20M3=20Expressive=20polish,=20edge=20cases,=20predictive=20bac?= =?UTF-8?q?k?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SDD: VM + screen tests expanded first, then implementation. - Add spring animations: GentleBounce/SmoothExit on animateItem() - Add reduce-motion guard (isReduceMotionEnabled -> skip springs) - Add shape morphing on photo avatar press - Add PredictiveBackHandler for Android 14+ - Add discard dialog (state-driven AlertDialog) - Add Material Icons per field type (Person, Phone, Email, Place, etc.) - Add M3 typography roles throughout (headlineMedium, bodyLarge, etc.) - Add AnimatedVisibility spring specs on MoreFieldsSection - Zero-account local-only contact support - PII-safe error handling (generic messages only) - 5 new VM tests, 5 new screen androidTests Co-Authored-By: Claude Opus 4.6 (1M context) --- .../ContactCreationEditorScreenTest.kt | 37 ++++++++++++ .../ContactCreationViewModelTest.kt | 59 ++++++++++++++++++- .../ContactCreationEditorScreen.kt | 56 +++++++++++++++++- .../ContactCreationViewModel.kt | 8 ++- .../contacts/ui/contactcreation/TestTags.kt | 5 ++ .../component/AddressSection.kt | 21 ++++++- .../contactcreation/component/EmailSection.kt | 22 ++++++- .../component/MoreFieldsSection.kt | 41 ++++++++++++- .../contactcreation/component/NameSection.kt | 53 +++++++++++------ .../component/OrganizationSection.kt | 53 +++++++++++------ .../contactcreation/component/PhoneSection.kt | 22 ++++++- .../contactcreation/component/PhotoSection.kt | 59 ++++++++++++------- .../model/ContactCreationAction.kt | 1 + .../model/ContactCreationEffect.kt | 1 - .../model/ContactCreationUiState.kt | 1 + src/com/android/contacts/ui/core/Theme.kt | 30 ++++++++++ 16 files changed, 400 insertions(+), 69 deletions(-) diff --git a/app/src/androidTest/java/com/android/contacts/ui/contactcreation/ContactCreationEditorScreenTest.kt b/app/src/androidTest/java/com/android/contacts/ui/contactcreation/ContactCreationEditorScreenTest.kt index d5316b7b6..77701cde0 100644 --- a/app/src/androidTest/java/com/android/contacts/ui/contactcreation/ContactCreationEditorScreenTest.kt +++ b/app/src/androidTest/java/com/android/contacts/ui/contactcreation/ContactCreationEditorScreenTest.kt @@ -89,6 +89,43 @@ class ContactCreationEditorScreenTest { composeTestRule.onNodeWithTag(TestTags.SAVE_BUTTON).assertIsEnabled() } + // --- Discard dialog --- + + @Test + fun discardDialog_rendersWhenShowDiscardDialogTrue() { + setContent(state = ContactCreationUiState(showDiscardDialog = true)) + composeTestRule.onNodeWithTag(TestTags.DISCARD_DIALOG).assertIsDisplayed() + } + + @Test + fun discardDialog_notRenderedByDefault() { + setContent() + composeTestRule.onNodeWithTag(TestTags.DISCARD_DIALOG).assertDoesNotExist() + } + + @Test + fun discardDialog_confirmDispatchesConfirmDiscard() { + setContent(state = ContactCreationUiState(showDiscardDialog = true)) + composeTestRule.onNodeWithTag(TestTags.DISCARD_DIALOG_CONFIRM).performClick() + assertEquals(ContactCreationAction.ConfirmDiscard, capturedActions.last()) + } + + @Test + fun discardDialog_dismissDispatchesDismissDiscardDialog() { + setContent(state = ContactCreationUiState(showDiscardDialog = true)) + composeTestRule.onNodeWithTag(TestTags.DISCARD_DIALOG_DISMISS).performClick() + assertEquals(ContactCreationAction.DismissDiscardDialog, capturedActions.last()) + } + + // --- More fields toggle --- + + @Test + fun moreFieldsToggle_dispatchesToggleMoreFieldsAction() { + setContent() + composeTestRule.onNodeWithTag(TestTags.MORE_FIELDS_TOGGLE).performClick() + assertEquals(ContactCreationAction.ToggleMoreFields, capturedActions.last()) + } + private fun setContent(state: ContactCreationUiState = ContactCreationUiState()) { composeTestRule.setContent { AppTheme { diff --git a/app/src/test/java/com/android/contacts/ui/contactcreation/ContactCreationViewModelTest.kt b/app/src/test/java/com/android/contacts/ui/contactcreation/ContactCreationViewModelTest.kt index 1b878a56e..b0479d027 100644 --- a/app/src/test/java/com/android/contacts/ui/contactcreation/ContactCreationViewModelTest.kt +++ b/app/src/test/java/com/android/contacts/ui/contactcreation/ContactCreationViewModelTest.kt @@ -3,6 +3,7 @@ package com.android.contacts.ui.contactcreation import android.net.Uri import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.android.contacts.model.RawContactDelta import com.android.contacts.test.MainDispatcherRule import com.android.contacts.ui.contactcreation.delegate.ContactFieldsDelegate import com.android.contacts.ui.contactcreation.mapper.RawContactDeltaMapper @@ -122,22 +123,43 @@ class ContactCreationViewModelTest { } @Test - fun navigateBack_withChanges_emitsDiscardDialog() = + fun navigateBack_withChanges_setsShowDiscardDialog() { + val vm = createViewModel() + vm.onAction(ContactCreationAction.UpdateFirstName("John")) + vm.onAction(ContactCreationAction.NavigateBack) + assertTrue(vm.uiState.value.showDiscardDialog) + } + + @Test + fun navigateBack_withChanges_doesNotEmitNavigateBack() = runTest(mainDispatcherRule.testDispatcher) { val vm = createViewModel() vm.onAction(ContactCreationAction.UpdateFirstName("John")) vm.effects.test { vm.onAction(ContactCreationAction.NavigateBack) - assertIs(awaitItem()) - cancelAndIgnoreRemainingEvents() + expectNoEvents() } } + @Test + fun dismissDiscardDialog_clearsShowDiscardDialog() { + val vm = createViewModel() + vm.onAction(ContactCreationAction.UpdateFirstName("John")) + vm.onAction(ContactCreationAction.NavigateBack) + assertTrue(vm.uiState.value.showDiscardDialog) + + vm.onAction(ContactCreationAction.DismissDiscardDialog) + assertFalse(vm.uiState.value.showDiscardDialog) + } + @Test fun confirmDiscard_emitsNavigateBack() = runTest(mainDispatcherRule.testDispatcher) { val vm = createViewModel() + vm.onAction(ContactCreationAction.UpdateFirstName("John")) + vm.onAction(ContactCreationAction.NavigateBack) + vm.effects.test { vm.onAction(ContactCreationAction.ConfirmDiscard) assertIs(awaitItem()) @@ -145,6 +167,37 @@ class ContactCreationViewModelTest { } } + @Test + fun confirmDiscard_clearsShowDiscardDialog() { + val vm = createViewModel() + vm.onAction(ContactCreationAction.UpdateFirstName("John")) + vm.onAction(ContactCreationAction.NavigateBack) + assertTrue(vm.uiState.value.showDiscardDialog) + + vm.onAction(ContactCreationAction.ConfirmDiscard) + assertFalse(vm.uiState.value.showDiscardDialog) + } + + // --- Zero-account / local-only --- + + @Test + fun save_withNoAccount_usesLocalAccount() = + runTest(mainDispatcherRule.testDispatcher) { + val vm = createViewModel() + vm.onAction(ContactCreationAction.UpdateFirstName("Local")) + + vm.effects.test { + vm.onAction(ContactCreationAction.Save) + val effect = awaitItem() + assertIs(effect) + val delta = effect.result.state[0] + assertIs(delta) + // When no account selected, mapper calls setAccountToLocal() + assertNull(vm.uiState.value.selectedAccount) + cancelAndIgnoreRemainingEvents() + } + } + @Test fun onSaveResult_success_emitsSaveSuccess() = runTest(mainDispatcherRule.testDispatcher) { diff --git a/src/com/android/contacts/ui/contactcreation/ContactCreationEditorScreen.kt b/src/com/android/contacts/ui/contactcreation/ContactCreationEditorScreen.kt index efd91d372..e7f63808a 100644 --- a/src/com/android/contacts/ui/contactcreation/ContactCreationEditorScreen.kt +++ b/src/com/android/contacts/ui/contactcreation/ContactCreationEditorScreen.kt @@ -2,18 +2,22 @@ package com.android.contacts.ui.contactcreation +import androidx.activity.compose.PredictiveBackHandler import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.Check +import androidx.compose.material3.AlertDialog import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.LargeTopAppBar +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text +import androidx.compose.material3.TextButton import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -30,6 +34,7 @@ import com.android.contacts.ui.contactcreation.component.phoneSection import com.android.contacts.ui.contactcreation.component.photoSection import com.android.contacts.ui.contactcreation.model.ContactCreationAction import com.android.contacts.ui.contactcreation.model.ContactCreationUiState +import kotlinx.coroutines.CancellationException @Composable internal fun ContactCreationEditorScreen( @@ -39,11 +44,25 @@ internal fun ContactCreationEditorScreen( ) { val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + PredictiveBackHandler(enabled = true) { flow -> + try { + flow.collect { /* consume progress events */ } + onAction(ContactCreationAction.NavigateBack) + } catch (_: CancellationException) { + // Back gesture cancelled, do nothing + } + } + Scaffold( modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection), topBar = { LargeTopAppBar( - title = { Text("Create contact") }, + title = { + Text( + "Create contact", + style = MaterialTheme.typography.headlineMedium, + ) + }, navigationIcon = { IconButton( onClick = { onAction(ContactCreationAction.NavigateBack) }, @@ -71,6 +90,41 @@ internal fun ContactCreationEditorScreen( contentPadding = contentPadding, ) } + + if (uiState.showDiscardDialog) { + DiscardChangesDialog(onAction = onAction) + } +} + +@Composable +private fun DiscardChangesDialog(onAction: (ContactCreationAction) -> Unit) { + AlertDialog( + onDismissRequest = { onAction(ContactCreationAction.DismissDiscardDialog) }, + title = { Text("Discard changes?") }, + text = { + Text( + "You have unsaved changes that will be lost.", + style = MaterialTheme.typography.bodyMedium, + ) + }, + confirmButton = { + TextButton( + onClick = { onAction(ContactCreationAction.ConfirmDiscard) }, + modifier = Modifier.testTag(TestTags.DISCARD_DIALOG_CONFIRM), + ) { + Text("Discard") + } + }, + dismissButton = { + TextButton( + onClick = { onAction(ContactCreationAction.DismissDiscardDialog) }, + modifier = Modifier.testTag(TestTags.DISCARD_DIALOG_DISMISS), + ) { + Text("Keep editing") + } + }, + modifier = Modifier.testTag(TestTags.DISCARD_DIALOG), + ) } @Composable diff --git a/src/com/android/contacts/ui/contactcreation/ContactCreationViewModel.kt b/src/com/android/contacts/ui/contactcreation/ContactCreationViewModel.kt index 6e22d21cf..5ed30c521 100644 --- a/src/com/android/contacts/ui/contactcreation/ContactCreationViewModel.kt +++ b/src/com/android/contacts/ui/contactcreation/ContactCreationViewModel.kt @@ -79,6 +79,7 @@ internal class ContactCreationViewModel @Inject constructor( is ContactCreationAction.NavigateBack -> handleBack() is ContactCreationAction.Save -> save() is ContactCreationAction.ConfirmDiscard -> confirmDiscard() + is ContactCreationAction.DismissDiscardDialog -> dismissDiscardDialog() // Name is ContactCreationAction.UpdatePrefix -> updateName { copy(prefix = action.value) } @@ -278,7 +279,7 @@ internal class ContactCreationViewModel @Inject constructor( private fun handleBack() { viewModelScope.launch { if (_uiState.value.hasPendingChanges()) { - _effects.send(ContactCreationEffect.ShowDiscardDialog) + updateState { copy(showDiscardDialog = true) } } else { _effects.send(ContactCreationEffect.NavigateBack) } @@ -287,10 +288,15 @@ internal class ContactCreationViewModel @Inject constructor( private fun confirmDiscard() { viewModelScope.launch { + updateState { copy(showDiscardDialog = false) } _effects.send(ContactCreationEffect.NavigateBack) } } + private fun dismissDiscardDialog() { + updateState { copy(showDiscardDialog = false) } + } + private fun requestCamera() { viewModelScope.launch(defaultDispatcher) { val photoDir = File(appContext.cacheDir, PHOTO_CACHE_DIR).apply { mkdirs() } diff --git a/src/com/android/contacts/ui/contactcreation/TestTags.kt b/src/com/android/contacts/ui/contactcreation/TestTags.kt index 6596f9f77..a16fb7eb4 100644 --- a/src/com/android/contacts/ui/contactcreation/TestTags.kt +++ b/src/com/android/contacts/ui/contactcreation/TestTags.kt @@ -83,6 +83,11 @@ internal object TestTags { // Account const val ACCOUNT_CHIP = "contact_creation_account_chip" + // Discard dialog + const val DISCARD_DIALOG = "contact_creation_discard_dialog" + const val DISCARD_DIALOG_CONFIRM = "contact_creation_discard_dialog_confirm" + const val DISCARD_DIALOG_DISMISS = "contact_creation_discard_dialog_dismiss" + // Photo const val PHOTO_AVATAR = "contact_creation_photo_avatar" const val PHOTO_MENU = "contact_creation_photo_menu" diff --git a/src/com/android/contacts/ui/contactcreation/component/AddressSection.kt b/src/com/android/contacts/ui/contactcreation/component/AddressSection.kt index 4893f27b6..5e7c3e4d3 100644 --- a/src/com/android/contacts/ui/contactcreation/component/AddressSection.kt +++ b/src/com/android/contacts/ui/contactcreation/component/AddressSection.kt @@ -9,8 +9,10 @@ import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.filled.Place import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.material3.TextButton @@ -22,6 +24,9 @@ import androidx.compose.ui.unit.dp import com.android.contacts.ui.contactcreation.TestTags import com.android.contacts.ui.contactcreation.model.AddressFieldState import com.android.contacts.ui.contactcreation.model.ContactCreationAction +import com.android.contacts.ui.core.gentleBounce +import com.android.contacts.ui.core.isReduceMotionEnabled +import com.android.contacts.ui.core.smoothExit internal fun LazyListScope.addressSection( addresses: List, @@ -32,11 +37,19 @@ internal fun LazyListScope.addressSection( key = { _, item -> item.id }, contentType = { _, _ -> "address_field" }, ) { index, address -> + val reduceMotion = isReduceMotionEnabled() AddressFieldRow( address = address, index = index, onAction = onAction, - modifier = Modifier.animateItem(), + modifier = if (reduceMotion) { + Modifier.animateItem() + } else { + Modifier.animateItem( + fadeInSpec = gentleBounce(), + fadeOutSpec = smoothExit(), + ) + }, ) } item(key = "address_add", contentType = "address_add") { @@ -63,6 +76,12 @@ internal fun AddressFieldRow( modifier = modifier.padding(horizontal = 16.dp), verticalAlignment = Alignment.Top, ) { + Icon( + imageVector = Icons.Filled.Place, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(end = 8.dp, top = 16.dp), + ) AddressFieldColumns( address = address, index = index, diff --git a/src/com/android/contacts/ui/contactcreation/component/EmailSection.kt b/src/com/android/contacts/ui/contactcreation/component/EmailSection.kt index a5f6aa79b..a7feb1418 100644 --- a/src/com/android/contacts/ui/contactcreation/component/EmailSection.kt +++ b/src/com/android/contacts/ui/contactcreation/component/EmailSection.kt @@ -1,15 +1,16 @@ package com.android.contacts.ui.contactcreation.component import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.filled.Email import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.material3.TextButton @@ -21,6 +22,9 @@ import androidx.compose.ui.unit.dp import com.android.contacts.ui.contactcreation.TestTags import com.android.contacts.ui.contactcreation.model.ContactCreationAction import com.android.contacts.ui.contactcreation.model.EmailFieldState +import com.android.contacts.ui.core.gentleBounce +import com.android.contacts.ui.core.isReduceMotionEnabled +import com.android.contacts.ui.core.smoothExit internal fun LazyListScope.emailSection( emails: List, @@ -31,12 +35,20 @@ internal fun LazyListScope.emailSection( key = { _, item -> item.id }, contentType = { _, _ -> "email_field" }, ) { index, email -> + val reduceMotion = isReduceMotionEnabled() EmailFieldRow( email = email, index = index, showDelete = emails.size > 1, onAction = onAction, - modifier = Modifier.animateItem(), + modifier = if (reduceMotion) { + Modifier.animateItem() + } else { + Modifier.animateItem( + fadeInSpec = gentleBounce(), + fadeOutSpec = smoothExit(), + ) + }, ) } item(key = "email_add", contentType = "email_add") { @@ -64,6 +76,12 @@ internal fun EmailFieldRow( modifier = modifier.padding(horizontal = 16.dp), verticalAlignment = Alignment.CenterVertically, ) { + Icon( + imageVector = Icons.Filled.Email, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(end = 8.dp), + ) OutlinedTextField( value = email.address, onValueChange = { onAction(ContactCreationAction.UpdateEmail(email.id, it)) }, diff --git a/src/com/android/contacts/ui/contactcreation/component/MoreFieldsSection.kt b/src/com/android/contacts/ui/contactcreation/component/MoreFieldsSection.kt index f0cec8d35..8823b427f 100644 --- a/src/com/android/contacts/ui/contactcreation/component/MoreFieldsSection.kt +++ b/src/com/android/contacts/ui/contactcreation/component/MoreFieldsSection.kt @@ -3,7 +3,11 @@ package com.android.contacts.ui.contactcreation.component import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.spring import androidx.compose.animation.expandVertically +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut import androidx.compose.animation.shrinkVertically import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -14,10 +18,15 @@ import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.filled.Event import androidx.compose.material.icons.filled.ExpandLess import androidx.compose.material.icons.filled.ExpandMore +import androidx.compose.material.icons.filled.Message +import androidx.compose.material.icons.filled.People +import androidx.compose.material.icons.filled.Public import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.material3.TextButton @@ -88,8 +97,12 @@ private fun LazyListScope.moreFieldsContent( item(key = "more_fields_content", contentType = "more_fields_content") { AnimatedVisibility( visible = isExpanded, - enter = expandVertically(), - exit = shrinkVertically(), + enter = expandVertically( + animationSpec = spring(stiffness = Spring.StiffnessMediumLow), + ) + fadeIn(), + exit = shrinkVertically( + animationSpec = spring(stiffness = Spring.StiffnessMedium), + ) + fadeOut(), modifier = Modifier.testTag(TestTags.MORE_FIELDS_CONTENT), ) { MoreFieldsSingleFields(nickname, note, sipAddress, showSipField, onAction) @@ -177,6 +190,12 @@ private fun EventFieldRow( modifier = modifier.padding(horizontal = 16.dp), verticalAlignment = Alignment.CenterVertically, ) { + Icon( + imageVector = Icons.Filled.Event, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(end = 8.dp), + ) OutlinedTextField( value = event.startDate, onValueChange = { onAction(ContactCreationAction.UpdateEvent(event.id, it)) }, @@ -232,6 +251,12 @@ private fun RelationFieldRow( modifier = modifier.padding(horizontal = 16.dp), verticalAlignment = Alignment.CenterVertically, ) { + Icon( + imageVector = Icons.Filled.People, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(end = 8.dp), + ) OutlinedTextField( value = relation.name, onValueChange = { onAction(ContactCreationAction.UpdateRelation(relation.id, it)) }, @@ -287,6 +312,12 @@ private fun ImFieldRow( modifier = modifier.padding(horizontal = 16.dp), verticalAlignment = Alignment.CenterVertically, ) { + Icon( + imageVector = Icons.Filled.Message, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(end = 8.dp), + ) OutlinedTextField( value = im.data, onValueChange = { onAction(ContactCreationAction.UpdateIm(im.id, it)) }, @@ -342,6 +373,12 @@ private fun WebsiteFieldRow( modifier = modifier.padding(horizontal = 16.dp), verticalAlignment = Alignment.CenterVertically, ) { + Icon( + imageVector = Icons.Filled.Public, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(end = 8.dp), + ) OutlinedTextField( value = website.url, onValueChange = { onAction(ContactCreationAction.UpdateWebsite(website.id, it)) }, diff --git a/src/com/android/contacts/ui/contactcreation/component/NameSection.kt b/src/com/android/contacts/ui/contactcreation/component/NameSection.kt index 6df8dc555..82cac9f32 100644 --- a/src/com/android/contacts/ui/contactcreation/component/NameSection.kt +++ b/src/com/android/contacts/ui/contactcreation/component/NameSection.kt @@ -1,12 +1,18 @@ package com.android.contacts.ui.contactcreation.component import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyListScope +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Person +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.testTag import androidx.compose.ui.unit.dp @@ -29,24 +35,35 @@ internal fun NameFields( onAction: (ContactCreationAction) -> Unit, modifier: Modifier = Modifier, ) { - Column(modifier = modifier.padding(horizontal = 16.dp)) { - OutlinedTextField( - value = nameState.first, - onValueChange = { onAction(ContactCreationAction.UpdateFirstName(it)) }, - label = { Text("First name") }, - modifier = Modifier - .fillMaxWidth() - .testTag(TestTags.NAME_FIRST), - singleLine = true, - ) - OutlinedTextField( - value = nameState.last, - onValueChange = { onAction(ContactCreationAction.UpdateLastName(it)) }, - label = { Text("Last name") }, - modifier = Modifier - .fillMaxWidth() - .testTag(TestTags.NAME_LAST), - singleLine = true, + Row( + modifier = modifier.padding(horizontal = 16.dp), + verticalAlignment = Alignment.Top, + ) { + Icon( + imageVector = Icons.Filled.Person, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(end = 8.dp, top = 16.dp), ) + Column(modifier = Modifier.weight(1f)) { + OutlinedTextField( + value = nameState.first, + onValueChange = { onAction(ContactCreationAction.UpdateFirstName(it)) }, + label = { Text("First name") }, + modifier = Modifier + .fillMaxWidth() + .testTag(TestTags.NAME_FIRST), + singleLine = true, + ) + OutlinedTextField( + value = nameState.last, + onValueChange = { onAction(ContactCreationAction.UpdateLastName(it)) }, + label = { Text("Last name") }, + modifier = Modifier + .fillMaxWidth() + .testTag(TestTags.NAME_LAST), + singleLine = true, + ) + } } } diff --git a/src/com/android/contacts/ui/contactcreation/component/OrganizationSection.kt b/src/com/android/contacts/ui/contactcreation/component/OrganizationSection.kt index 9c94b5de2..241f38438 100644 --- a/src/com/android/contacts/ui/contactcreation/component/OrganizationSection.kt +++ b/src/com/android/contacts/ui/contactcreation/component/OrganizationSection.kt @@ -1,12 +1,18 @@ package com.android.contacts.ui.contactcreation.component import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyListScope +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Business +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.testTag import androidx.compose.ui.unit.dp @@ -29,24 +35,35 @@ internal fun OrganizationFields( onAction: (ContactCreationAction) -> Unit, modifier: Modifier = Modifier, ) { - Column(modifier = modifier.padding(horizontal = 16.dp)) { - OutlinedTextField( - value = organization.company, - onValueChange = { onAction(ContactCreationAction.UpdateCompany(it)) }, - label = { Text("Company") }, - modifier = Modifier - .fillMaxWidth() - .testTag(TestTags.ORG_COMPANY), - singleLine = true, - ) - OutlinedTextField( - value = organization.title, - onValueChange = { onAction(ContactCreationAction.UpdateJobTitle(it)) }, - label = { Text("Title") }, - modifier = Modifier - .fillMaxWidth() - .testTag(TestTags.ORG_TITLE), - singleLine = true, + Row( + modifier = modifier.padding(horizontal = 16.dp), + verticalAlignment = Alignment.Top, + ) { + Icon( + imageVector = Icons.Filled.Business, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(end = 8.dp, top = 16.dp), ) + Column(modifier = Modifier.weight(1f)) { + OutlinedTextField( + value = organization.company, + onValueChange = { onAction(ContactCreationAction.UpdateCompany(it)) }, + label = { Text("Company") }, + modifier = Modifier + .fillMaxWidth() + .testTag(TestTags.ORG_COMPANY), + singleLine = true, + ) + OutlinedTextField( + value = organization.title, + onValueChange = { onAction(ContactCreationAction.UpdateJobTitle(it)) }, + label = { Text("Title") }, + modifier = Modifier + .fillMaxWidth() + .testTag(TestTags.ORG_TITLE), + singleLine = true, + ) + } } } diff --git a/src/com/android/contacts/ui/contactcreation/component/PhoneSection.kt b/src/com/android/contacts/ui/contactcreation/component/PhoneSection.kt index 0abe4666c..2f927e310 100644 --- a/src/com/android/contacts/ui/contactcreation/component/PhoneSection.kt +++ b/src/com/android/contacts/ui/contactcreation/component/PhoneSection.kt @@ -1,15 +1,16 @@ package com.android.contacts.ui.contactcreation.component import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.filled.Phone import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.material3.TextButton @@ -21,6 +22,9 @@ import androidx.compose.ui.unit.dp import com.android.contacts.ui.contactcreation.TestTags import com.android.contacts.ui.contactcreation.model.ContactCreationAction import com.android.contacts.ui.contactcreation.model.PhoneFieldState +import com.android.contacts.ui.core.gentleBounce +import com.android.contacts.ui.core.isReduceMotionEnabled +import com.android.contacts.ui.core.smoothExit internal fun LazyListScope.phoneSection( phones: List, @@ -31,12 +35,20 @@ internal fun LazyListScope.phoneSection( key = { _, item -> item.id }, contentType = { _, _ -> "phone_field" }, ) { index, phone -> + val reduceMotion = isReduceMotionEnabled() PhoneFieldRow( phone = phone, index = index, showDelete = phones.size > 1, onAction = onAction, - modifier = Modifier.animateItem(), + modifier = if (reduceMotion) { + Modifier.animateItem() + } else { + Modifier.animateItem( + fadeInSpec = gentleBounce(), + fadeOutSpec = smoothExit(), + ) + }, ) } item(key = "phone_add", contentType = "phone_add") { @@ -64,6 +76,12 @@ internal fun PhoneFieldRow( modifier = modifier.padding(horizontal = 16.dp), verticalAlignment = Alignment.CenterVertically, ) { + Icon( + imageVector = Icons.Filled.Phone, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(end = 8.dp), + ) OutlinedTextField( value = phone.number, onValueChange = { onAction(ContactCreationAction.UpdatePhone(phone.id, it)) }, diff --git a/src/com/android/contacts/ui/contactcreation/component/PhotoSection.kt b/src/com/android/contacts/ui/contactcreation/component/PhotoSection.kt index e58e01ed9..d581d83e8 100644 --- a/src/com/android/contacts/ui/contactcreation/component/PhotoSection.kt +++ b/src/com/android/contacts/ui/contactcreation/component/PhotoSection.kt @@ -1,13 +1,19 @@ package com.android.contacts.ui.contactcreation.component import android.net.Uri +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.animateDpAsState +import androidx.compose.animation.core.spring import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.interaction.collectIsPressedAsState import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.CameraAlt import androidx.compose.material.icons.filled.Close @@ -41,6 +47,7 @@ import com.android.contacts.ui.contactcreation.model.ContactCreationAction private const val AVATAR_SIZE_DP = 96 private const val PHOTO_DOWNSAMPLE_PX = 288 // 96dp * 3 (xxxhdpi) private const val PLACEHOLDER_ICON_SIZE_DP = 48 +private const val MORPHED_CORNER_DP = 16 internal fun LazyListScope.photoSection( photoUri: Uri?, @@ -64,10 +71,41 @@ internal fun PhotoAvatar( modifier: Modifier = Modifier, ) { var menuExpanded by remember { mutableStateOf(false) } + val interactionSource = remember { MutableInteractionSource() } + val isPressed by interactionSource.collectIsPressedAsState() + + val cornerRadius by animateDpAsState( + targetValue = if (isPressed) MORPHED_CORNER_DP.dp else (AVATAR_SIZE_DP / 2).dp, + animationSpec = spring( + dampingRatio = Spring.DampingRatioMediumBouncy, + stiffness = Spring.StiffnessMediumLow, + ), + label = "avatar_shape_morph", + ) + val morphedShape = RoundedCornerShape(cornerRadius) Box(modifier = modifier, contentAlignment = Alignment.Center) { Box { - AvatarSurface(photoUri = photoUri, onClick = { menuExpanded = true }) + Surface( + modifier = Modifier + .size(AVATAR_SIZE_DP.dp) + .clip(morphedShape) + .testTag(TestTags.PHOTO_AVATAR) + .clickable( + interactionSource = interactionSource, + indication = null, + ) { + menuExpanded = true + }, + shape = morphedShape, + color = MaterialTheme.colorScheme.surfaceVariant, + ) { + if (photoUri != null) { + PhotoImage(photoUri) + } else { + PlaceholderIcon() + } + } PhotoDropdownMenu( expanded = menuExpanded, hasPhoto = photoUri != null, @@ -78,25 +116,6 @@ internal fun PhotoAvatar( } } -@Composable -private fun AvatarSurface(photoUri: Uri?, onClick: () -> Unit) { - Surface( - modifier = Modifier - .size(AVATAR_SIZE_DP.dp) - .clip(CircleShape) - .testTag(TestTags.PHOTO_AVATAR) - .clickable(onClick = onClick), - shape = CircleShape, - color = MaterialTheme.colorScheme.surfaceVariant, - ) { - if (photoUri != null) { - PhotoImage(photoUri) - } else { - PlaceholderIcon() - } - } -} - @Composable private fun PhotoImage(photoUri: Uri) { AsyncImage( diff --git a/src/com/android/contacts/ui/contactcreation/model/ContactCreationAction.kt b/src/com/android/contacts/ui/contactcreation/model/ContactCreationAction.kt index 643155c57..978a593f1 100644 --- a/src/com/android/contacts/ui/contactcreation/model/ContactCreationAction.kt +++ b/src/com/android/contacts/ui/contactcreation/model/ContactCreationAction.kt @@ -16,6 +16,7 @@ internal sealed interface ContactCreationAction { data object NavigateBack : ContactCreationAction data object Save : ContactCreationAction data object ConfirmDiscard : ContactCreationAction + data object DismissDiscardDialog : ContactCreationAction // Name data class UpdatePrefix(val value: String) : ContactCreationAction diff --git a/src/com/android/contacts/ui/contactcreation/model/ContactCreationEffect.kt b/src/com/android/contacts/ui/contactcreation/model/ContactCreationEffect.kt index ca57ed860..dbc2093a4 100644 --- a/src/com/android/contacts/ui/contactcreation/model/ContactCreationEffect.kt +++ b/src/com/android/contacts/ui/contactcreation/model/ContactCreationEffect.kt @@ -7,7 +7,6 @@ internal sealed interface ContactCreationEffect { data class Save(val result: DeltaMapperResult) : ContactCreationEffect data class SaveSuccess(val contactUri: Uri?) : ContactCreationEffect data class ShowError(val messageResId: Int) : ContactCreationEffect - data object ShowDiscardDialog : ContactCreationEffect data object NavigateBack : ContactCreationEffect data object LaunchGallery : ContactCreationEffect data class LaunchCamera(val outputUri: Uri) : ContactCreationEffect diff --git a/src/com/android/contacts/ui/contactcreation/model/ContactCreationUiState.kt b/src/com/android/contacts/ui/contactcreation/model/ContactCreationUiState.kt index 63f75a9fc..7e76973a6 100644 --- a/src/com/android/contacts/ui/contactcreation/model/ContactCreationUiState.kt +++ b/src/com/android/contacts/ui/contactcreation/model/ContactCreationUiState.kt @@ -37,6 +37,7 @@ internal data class ContactCreationUiState( val isSaving: Boolean = false, val isMoreFieldsExpanded: Boolean = false, val showSipField: Boolean = true, + val showDiscardDialog: Boolean = false, ) : Parcelable { @Suppress("CyclomaticComplexMethod") fun hasPendingChanges(): Boolean = diff --git a/src/com/android/contacts/ui/core/Theme.kt b/src/com/android/contacts/ui/core/Theme.kt index 2165a9a30..0d3b5d70b 100644 --- a/src/com/android/contacts/ui/core/Theme.kt +++ b/src/com/android/contacts/ui/core/Theme.kt @@ -1,5 +1,8 @@ package com.android.contacts.ui.core +import android.provider.Settings +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.spring import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.MaterialTheme @@ -7,6 +10,7 @@ import androidx.compose.material3.Shapes import androidx.compose.material3.dynamicDarkColorScheme import androidx.compose.material3.dynamicLightColorScheme import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp @@ -34,3 +38,29 @@ fun AppTheme( content = content, ) } + +/** True when the user has enabled reduce-motion / disabled animations. */ +@Composable +internal fun isReduceMotionEnabled(): Boolean { + val context = LocalContext.current + return remember { + val scale = Settings.Global.getFloat( + context.contentResolver, + Settings.Global.ANIMATOR_DURATION_SCALE, + 1f, + ) + scale == 0f + } +} + +/** Gentle bounce for item entrance animations. */ +internal fun gentleBounce() = spring( + dampingRatio = Spring.DampingRatioLowBouncy, + stiffness = Spring.StiffnessMediumLow, +) + +/** Smooth exit with no overshoot for item removal animations. */ +internal fun smoothExit() = spring( + dampingRatio = Spring.DampingRatioNoBouncy, + stiffness = Spring.StiffnessMedium, +) From b74b790504e0b11549006889f403163e3e97911f Mon Sep 17 00:00:00 2001 From: nrobi144 Date: Tue, 14 Apr 2026 15:44:35 +0300 Subject: [PATCH 29/29] =?UTF-8?q?test(contacts):=20Phase=205=20=E2=80=94?= =?UTF-8?q?=20test=20hardening,=20220=20tests=20total?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Coverage audit: added 38 tests to fill gaps identified during review. Mapper (+26): - Whitespace-only fields treated as blank (11 field types) - Multiple entries for repeatables (emails, events, relations, IMs, websites) - Non-custom type does NOT set LABEL column - Temp ID is negative - Mixed blank/populated repeatables (only populated saved) ViewModel (+12): - Full process death round-trip (all 13+ fields serialize/restore) - Extended field actions (address, event, note, nickname, SIP, etc.) - SelectAccount clears groups - ToggleMoreFields - hasPendingChanges edge cases Total: 68 mapper, 46 delegate, 35 VM, 71 androidTest = 220 tests Co-Authored-By: Claude Opus 4.6 (1M context) --- .../ContactCreationViewModelTest.kt | 165 +++++++++ .../mapper/RawContactDeltaMapperTest.kt | 331 ++++++++++++++++++ 2 files changed, 496 insertions(+) diff --git a/app/src/test/java/com/android/contacts/ui/contactcreation/ContactCreationViewModelTest.kt b/app/src/test/java/com/android/contacts/ui/contactcreation/ContactCreationViewModelTest.kt index b0479d027..f00449a8c 100644 --- a/app/src/test/java/com/android/contacts/ui/contactcreation/ContactCreationViewModelTest.kt +++ b/app/src/test/java/com/android/contacts/ui/contactcreation/ContactCreationViewModelTest.kt @@ -276,6 +276,171 @@ class ContactCreationViewModelTest { } } + // --- Process death round-trip --- + + @Test + fun processDeathRestore_preservesAllFieldTypes() { + val savedState = ContactCreationUiState( + nameState = NameState( + prefix = "Dr", + first = "John", + middle = "M", + last = "Doe", + suffix = "Jr", + ), + phoneNumbers = listOf(PhoneFieldState(number = "555")), + emails = listOf( + com.android.contacts.ui.contactcreation.model.EmailFieldState(address = "a@b.com"), + ), + addresses = listOf( + com.android.contacts.ui.contactcreation.model.AddressFieldState( + street = "123 Main", + ), + ), + organization = com.android.contacts.ui.contactcreation.model.OrganizationFieldState( + company = "Acme", + title = "Eng", + ), + events = listOf( + com.android.contacts.ui.contactcreation.model.EventFieldState( + startDate = "1990-01-01", + ), + ), + relations = listOf( + com.android.contacts.ui.contactcreation.model.RelationFieldState(name = "Jane"), + ), + imAccounts = listOf( + com.android.contacts.ui.contactcreation.model.ImFieldState(data = "user@jabber"), + ), + websites = listOf( + com.android.contacts.ui.contactcreation.model.WebsiteFieldState( + url = "https://site.com", + ), + ), + note = "Important", + nickname = "Johnny", + sipAddress = "sip:user@voip.example.com", + photoUri = Uri.parse("content://media/external/images/99"), + isMoreFieldsExpanded = true, + ) + val vm = createViewModel(initialState = savedState) + val restored = vm.uiState.value + + assertEquals("Dr", restored.nameState.prefix) + assertEquals("John", restored.nameState.first) + assertEquals("M", restored.nameState.middle) + assertEquals("Doe", restored.nameState.last) + assertEquals("Jr", restored.nameState.suffix) + assertEquals("555", restored.phoneNumbers[0].number) + assertEquals("a@b.com", restored.emails[0].address) + assertEquals("123 Main", restored.addresses[0].street) + assertEquals("Acme", restored.organization.company) + assertEquals("Eng", restored.organization.title) + assertEquals("1990-01-01", restored.events[0].startDate) + assertEquals("Jane", restored.relations[0].name) + assertEquals("user@jabber", restored.imAccounts[0].data) + assertEquals("https://site.com", restored.websites[0].url) + assertEquals("Important", restored.note) + assertEquals("Johnny", restored.nickname) + assertEquals("sip:user@voip.example.com", restored.sipAddress) + assertEquals(Uri.parse("content://media/external/images/99"), restored.photoUri) + assertTrue(restored.isMoreFieldsExpanded) + } + + // --- ToggleMoreFields --- + + @Test + fun toggleMoreFields_togglesIsMoreFieldsExpanded() { + val vm = createViewModel() + assertFalse(vm.uiState.value.isMoreFieldsExpanded) + vm.onAction(ContactCreationAction.ToggleMoreFields) + assertTrue(vm.uiState.value.isMoreFieldsExpanded) + vm.onAction(ContactCreationAction.ToggleMoreFields) + assertFalse(vm.uiState.value.isMoreFieldsExpanded) + } + + // --- Extended field actions --- + + @Test + fun addAddress_addsRow() { + val vm = createViewModel() + assertTrue(vm.uiState.value.addresses.isEmpty()) + vm.onAction(ContactCreationAction.AddAddress) + assertEquals(1, vm.uiState.value.addresses.size) + } + + @Test + fun addEvent_addsRow() { + val vm = createViewModel() + assertTrue(vm.uiState.value.events.isEmpty()) + vm.onAction(ContactCreationAction.AddEvent) + assertEquals(1, vm.uiState.value.events.size) + } + + @Test + fun updateNote_updatesState() { + val vm = createViewModel() + vm.onAction(ContactCreationAction.UpdateNote("A note")) + assertEquals("A note", vm.uiState.value.note) + } + + @Test + fun updateNickname_updatesState() { + val vm = createViewModel() + vm.onAction(ContactCreationAction.UpdateNickname("Johnny")) + assertEquals("Johnny", vm.uiState.value.nickname) + } + + @Test + fun updateSipAddress_updatesState() { + val vm = createViewModel() + vm.onAction(ContactCreationAction.UpdateSipAddress("sip:user@voip")) + assertEquals("sip:user@voip", vm.uiState.value.sipAddress) + } + + @Test + fun updateCompany_updatesState() { + val vm = createViewModel() + vm.onAction(ContactCreationAction.UpdateCompany("Acme")) + assertEquals("Acme", vm.uiState.value.organization.company) + } + + @Test + fun updateJobTitle_updatesState() { + val vm = createViewModel() + vm.onAction(ContactCreationAction.UpdateJobTitle("Engineer")) + assertEquals("Engineer", vm.uiState.value.organization.title) + } + + @Test + fun selectAccount_clearsGroups() { + val vm = createViewModel() + vm.onAction(ContactCreationAction.ToggleGroup(1L, "Friends")) + assertEquals(1, vm.uiState.value.groups.size) + + val account = com.android.contacts.model.account.AccountWithDataSet( + "test", + "com.test", + null, + ) + vm.onAction(ContactCreationAction.SelectAccount(account)) + assertTrue(vm.uiState.value.groups.isEmpty()) + assertEquals(account, vm.uiState.value.selectedAccount) + } + + @Test + fun hasPendingChanges_trueForNote() { + val vm = createViewModel() + vm.onAction(ContactCreationAction.UpdateNote("text")) + assertTrue(vm.uiState.value.hasPendingChanges()) + } + + @Test + fun hasPendingChanges_falseForDefaultState() { + val vm = createViewModel() + assertFalse(vm.uiState.value.hasPendingChanges()) + } + private fun createViewModel( initialState: ContactCreationUiState = ContactCreationUiState(), ): ContactCreationViewModel { diff --git a/app/src/test/java/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapperTest.kt b/app/src/test/java/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapperTest.kt index d886f0c14..bc4351017 100644 --- a/app/src/test/java/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapperTest.kt +++ b/app/src/test/java/com/android/contacts/ui/contactcreation/mapper/RawContactDeltaMapperTest.kt @@ -656,4 +656,335 @@ class RawContactDeltaMapperTest { assertEquals(2, entries!!.size) } + + // --- Multiple entries for repeatable fields --- + + @Test + fun multipleEmails_producesMultipleEntries() { + val state = ContactCreationUiState( + emails = listOf( + EmailFieldState(address = "a@b.com"), + EmailFieldState(address = "c@d.com"), + ), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Email.CONTENT_ITEM_TYPE) + + assertEquals(2, entries!!.size) + } + + @Test + fun multipleEvents_producesMultipleEntries() { + val state = ContactCreationUiState( + events = listOf( + EventFieldState(startDate = "2020-01-01"), + EventFieldState(startDate = "2021-06-15"), + ), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Event.CONTENT_ITEM_TYPE) + + assertEquals(2, entries!!.size) + } + + @Test + fun multipleRelations_producesMultipleEntries() { + val state = ContactCreationUiState( + relations = listOf( + RelationFieldState(name = "Jane"), + RelationFieldState(name = "Bob"), + ), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Relation.CONTENT_ITEM_TYPE) + + assertEquals(2, entries!!.size) + } + + @Test + fun multipleImAccounts_producesMultipleEntries() { + val state = ContactCreationUiState( + imAccounts = listOf( + ImFieldState(data = "user1@jabber.org"), + ImFieldState(data = "user2@jabber.org"), + ), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Im.CONTENT_ITEM_TYPE) + + assertEquals(2, entries!!.size) + } + + @Test + fun multipleWebsites_producesMultipleEntries() { + val state = ContactCreationUiState( + websites = listOf( + WebsiteFieldState(url = "https://one.com"), + WebsiteFieldState(url = "https://two.com"), + ), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Website.CONTENT_ITEM_TYPE) + + assertEquals(2, entries!!.size) + } + + // --- Non-custom types do NOT set LABEL column --- + + @Test + fun nonCustomPhoneType_doesNotSetLabel() { + val state = ContactCreationUiState( + phoneNumbers = listOf(PhoneFieldState(number = "555", type = PhoneType.Home)), + ) + val result = mapper.map(state, account = null) + val entry = result.state[0].getMimeEntries(Phone.CONTENT_ITEM_TYPE)!![0] + + assertEquals(Phone.TYPE_HOME, entry.getAsInteger(Phone.TYPE)) + assertNull(entry.getAsString(Phone.LABEL)) + } + + @Test + fun nonCustomEmailType_doesNotSetLabel() { + val state = ContactCreationUiState( + emails = listOf(EmailFieldState(address = "a@b.com", type = EmailType.Work)), + ) + val result = mapper.map(state, account = null) + val entry = result.state[0].getMimeEntries(Email.CONTENT_ITEM_TYPE)!![0] + + assertEquals(Email.TYPE_WORK, entry.getAsInteger(Email.TYPE)) + assertNull(entry.getAsString(Email.LABEL)) + } + + @Test + fun nonCustomImProtocol_doesNotSetCustomProtocol() { + val state = ContactCreationUiState( + imAccounts = listOf(ImFieldState(data = "user", protocol = ImProtocol.Skype)), + ) + val result = mapper.map(state, account = null) + val entry = result.state[0].getMimeEntries(Im.CONTENT_ITEM_TYPE)!![0] + + assertEquals(Im.PROTOCOL_SKYPE, entry.getAsInteger(Im.PROTOCOL)) + assertNull(entry.getAsString(Im.CUSTOM_PROTOCOL)) + } + + // --- Temp ID is negative --- + + @Test + fun tempId_isNegative() { + val state = ContactCreationUiState( + nameState = NameState(first = "Test"), + ) + val result = mapper.map(state, account = null) + val tempId = result.state[0].values.id + + assertTrue("Temp ID should be negative, was $tempId", tempId < 0) + } + + // --- Whitespace-only fields treated as blank --- + + @Test + fun whitespaceOnlyPhone_notIncluded() { + val state = ContactCreationUiState( + phoneNumbers = listOf(PhoneFieldState(number = " \t ")), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Phone.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun whitespaceOnlyEmail_notIncluded() { + val state = ContactCreationUiState( + emails = listOf(EmailFieldState(address = " ")), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Email.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun whitespaceOnlyNote_notIncluded() { + val state = ContactCreationUiState(note = " \n ") + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Note.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun whitespaceOnlyNickname_notIncluded() { + val state = ContactCreationUiState(nickname = " ") + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Nickname.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun whitespaceOnlySipAddress_notIncluded() { + val state = ContactCreationUiState(sipAddress = " \t ") + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(SipAddress.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun whitespaceOnlyName_notIncluded() { + val state = ContactCreationUiState( + nameState = NameState(first = " ", last = " \t"), + phoneNumbers = listOf(PhoneFieldState(number = "555")), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(StructuredName.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun whitespaceOnlyWebsite_notIncluded() { + val state = ContactCreationUiState( + websites = listOf(WebsiteFieldState(url = " ")), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Website.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun whitespaceOnlyEvent_notIncluded() { + val state = ContactCreationUiState( + events = listOf(EventFieldState(startDate = " ")), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Event.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun whitespaceOnlyRelation_notIncluded() { + val state = ContactCreationUiState( + relations = listOf(RelationFieldState(name = " ")), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Relation.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun whitespaceOnlyIm_notIncluded() { + val state = ContactCreationUiState( + imAccounts = listOf(ImFieldState(data = " ")), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Im.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun whitespaceOnlyAddress_notIncluded() { + val state = ContactCreationUiState( + addresses = listOf(AddressFieldState(street = " ", city = " \t")), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(StructuredPostal.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + @Test + fun whitespaceOnlyOrganization_notIncluded() { + val state = ContactCreationUiState( + organization = OrganizationFieldState(company = " ", title = " \t"), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Organization.CONTENT_ITEM_TYPE) + + assertTrue(entries.isNullOrEmpty()) + } + + // --- Mixed blank/populated repeatable fields (only populated saved) --- + + @Test + fun mixedBlankAndPopulatedEvents_onlyMapsPopulated() { + val state = ContactCreationUiState( + events = listOf( + EventFieldState(startDate = ""), + EventFieldState(startDate = "2020-01-01"), + EventFieldState(startDate = " "), + ), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Event.CONTENT_ITEM_TYPE) + + assertEquals(1, entries!!.size) + assertEquals("2020-01-01", entries[0].getAsString(Event.START_DATE)) + } + + @Test + fun mixedBlankAndPopulatedRelations_onlyMapsPopulated() { + val state = ContactCreationUiState( + relations = listOf( + RelationFieldState(name = ""), + RelationFieldState(name = "Jane"), + ), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Relation.CONTENT_ITEM_TYPE) + + assertEquals(1, entries!!.size) + assertEquals("Jane", entries[0].getAsString(Relation.NAME)) + } + + @Test + fun mixedBlankAndPopulatedWebsites_onlyMapsPopulated() { + val state = ContactCreationUiState( + websites = listOf( + WebsiteFieldState(url = ""), + WebsiteFieldState(url = "https://site.com"), + WebsiteFieldState(url = " "), + ), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Website.CONTENT_ITEM_TYPE) + + assertEquals(1, entries!!.size) + assertEquals("https://site.com", entries[0].getAsString(Website.URL)) + } + + @Test + fun mixedBlankAndPopulatedIms_onlyMapsPopulated() { + val state = ContactCreationUiState( + imAccounts = listOf( + ImFieldState(data = ""), + ImFieldState(data = "user@jabber"), + ), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(Im.CONTENT_ITEM_TYPE) + + assertEquals(1, entries!!.size) + assertEquals("user@jabber", entries[0].getAsString(Im.DATA)) + } + + @Test + fun mixedBlankAndPopulatedAddresses_onlyMapsPopulated() { + val state = ContactCreationUiState( + addresses = listOf( + AddressFieldState(), + AddressFieldState(street = "123 Main"), + ), + ) + val result = mapper.map(state, account = null) + val entries = result.state[0].getMimeEntries(StructuredPostal.CONTENT_ITEM_TYPE) + + assertEquals(1, entries!!.size) + assertEquals("123 Main", entries[0].getAsString(StructuredPostal.STREET)) + } }