Skip to content

Name changes as per the new name personalid #3110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pm-dimagi merged 3 commits into from
May 15, 2025
Merged

Name changes as per the new name personalid #3110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f0785a
-name changes ar per the new name personalid
pm-dimagi May 15, 2025
adacdfd
Merge branch 'master' of https://github.com/dimagi/commcare-android i…
pm-dimagi May 15, 2025
fcbceea
-resolve conflicts from master
pm-dimagi May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 app/res/layout/screen_connect_message.xml → app/res/layout/screen_personalid_message.xml
View file
Open in desktop
File renamed without changes.
0 ...es/layout/screen_connect_phone_verify.xml → ...layout/screen_personalid_phone_verify.xml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion app/res/layout/fragment_signup.xml → app/res/layout/screen_personalid_phoneno.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
tools:context="org.commcare.fragments.connectId.ConnectIDSignupFragment">
tools:context="org.commcare.fragments.connectId.PersonalIdPhoneFragment">

<ScrollView
android:id="@+id/firstLayout"
Expand Down
0 app/res/layout/screen_connect_verify.xml → app/res/layout/screen_personalid_verify.xml
View file
Open in desktop
File renamed without changes.
138 changes: 69 additions & 69 deletions app/res/navigation/nav_graph_connectid.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/nav_graph_connectid"
app:startDestination="@id/connectid_signup_fragment">
android:id="@+id/nav_graph_personalid"
app:startDestination="@id/personalid_phone_fragment">
<dialog
android:id="@+id/connectid_phone_not_available"
android:name="org.commcare.fragments.connectId.ConnectIdPhoneAvailableBottomSheet"
android:label="fragment_connectid_phone_available_fragment"
tools:layout="@layout/fragment_phone_available_bottom_sheet">
<action
android:id="@+id/action_connectid_phone_not_available_to_connectid_phone_fragment"
app:destination="@id/connectid_signup_fragment" />
app:destination="@id/personalid_phone_fragment" />
<argument
android:name="phone"
app:argType="string" />
Expand All @@ -22,52 +22,52 @@
</dialog>

<fragment
android:id="@+id/connectid_biometric_config"
android:name="org.commcare.fragments.connectId.ConnectIdBiometricConfigFragment"
android:label="fragment_connectid_biometric_config"
tools:layout="@layout/screen_connect_verify">
android:id="@+id/personalid_biometric_config"
android:name="org.commcare.fragments.connectId.PersonalIdBiometricConfigFragment"
android:label="fragment_personalid_biometric_config"
tools:layout="@layout/screen_personalid_verify">
<action
android:id="@+id/action_connectid_biometric_config_to_connectid_phone_verify"
app:destination="@id/connectid_phone_verify"
app:popUpTo="@id/connectid_biometric_config" />
app:destination="@id/personalid_otp_page"
app:popUpTo="@id/personalid_biometric_config" />
<action
android:id="@+id/action_connectid_biometric_config_to_connectid_message"
app:destination="@id/connectid_message"
app:popUpTo="@id/connectid_biometric_config" />
android:id="@+id/action_personalid_biometric_config_to_personalid_message"
app:destination="@id/personalid_message_display"
app:popUpTo="@id/personalid_biometric_config" />
<argument
android:name="callingClass"
app:argType="integer"
app:nullable="false" />
</fragment>

<fragment
android:id="@+id/connectid_phone_verify"
android:name="org.commcare.fragments.connectId.ConnectIdPhoneVerificationFragment"
android:label="fragment_connectid_phone_verify"
tools:layout="@layout/screen_connect_phone_verify">
android:id="@+id/personalid_otp_page"
android:name="org.commcare.fragments.connectId.PersonalIdPhoneVerificationFragment"
android:label="fragment_personalid_phone_verify"
tools:layout="@layout/screen_personalid_phone_verify">
<action
android:id="@+id/action_connectid_phone_verify_to_connectid_pin"
app:destination="@id/connectid_pin"
app:popUpTo="@id/connectid_phone_verify" />
app:destination="@id/personalid_backup_code"
app:popUpTo="@id/personalid_otp_page" />
<action
android:id="@+id/action_connectid_phone_verify_to_connectid_biometric_config"
app:destination="@id/connectid_biometric_config"
app:popUpTo="@id/connectid_phone_verify" />
app:destination="@id/personalid_biometric_config"
app:popUpTo="@id/personalid_otp_page" />
<action
android:id="@+id/action_connectid_phone_verify_to_connectid_password"
app:destination="@id/connectid_password"
app:popUpTo="@id/connectid_phone_verify" />
app:popUpTo="@id/personalid_otp_page" />
<action
android:id="@+id/action_connectid_phone_verify_to_connectid_message"
app:destination="@id/connectid_message"
app:popUpTo="@id/connectid_phone_verify" />
app:destination="@id/personalid_message_display"
app:popUpTo="@id/personalid_otp_page" />
<action
android:id="@+id/action_connectid_phone_verify_self"
app:destination="@id/connectid_phone_verify"
app:popUpTo="@id/connectid_phone_verify" />
app:destination="@id/personalid_otp_page"
app:popUpTo="@id/personalid_otp_page" />
<action
android:id="@+id/action_connectid_phone_verify_to_connectid_signup_fragment"
app:destination="@id/connectid_signup_fragment" />
app:destination="@id/personalid_phone_fragment" />
<argument
android:name="callingClass"
app:argType="integer"
Expand Down Expand Up @@ -100,45 +100,45 @@
app:destination="@id/connectid_user_deactivate_otp_verify" />
<action
android:id="@+id/action_connectid_phone_verify_to_connectid_signup_fragment2"
app:destination="@id/connectid_signup_fragment" />
app:destination="@id/personalid_phone_fragment" />
<action
android:id="@+id/action_connectid_phone_verify_to_connectid_phoneNo"
app:destination="@id/connectid_phoneNo" />
</fragment>

<dialog
android:id="@+id/connectid_message"
android:name="org.commcare.fragments.connectId.ConnectIdMessageFragment"
android:label="fragment_connectid_message"
tools:layout="@layout/screen_connect_message">
android:id="@+id/personalid_message_display"
android:name="org.commcare.fragments.connectId.PersonalIdMessageFragment"
android:label="fragment_personalid_message"
tools:layout="@layout/screen_personalid_message">
<action
android:id="@+id/action_connectid_message_to_connectid_biometric_config"
app:destination="@id/connectid_biometric_config"
app:popUpTo="@id/connectid_message" />
app:destination="@id/personalid_biometric_config"
app:popUpTo="@id/personalid_message_display" />
<action
android:id="@+id/action_connectid_message_to_connectid_pin"
app:destination="@id/connectid_pin"
app:popUpTo="@id/connectid_message" />
app:destination="@id/personalid_backup_code"
app:popUpTo="@id/personalid_message_display" />
<action
android:id="@+id/action_connectid_message_to_connectid_password"
app:destination="@id/connectid_password"
app:popUpTo="@id/connectid_message" />
app:popUpTo="@id/personalid_message_display" />
<action
android:id="@+id/action_connectid_message_to_connectid_phone_verify"
app:destination="@id/connectid_phone_verify"
app:popUpTo="@id/connectid_signup_fragment"
app:destination="@id/personalid_otp_page"
app:popUpTo="@id/personalid_phone_fragment"
app:popUpToInclusive="true"/>
<action
android:id="@+id/action_connectid_message_to_connectid_user_deactivate_otp_verify"
app:destination="@id/connectid_user_deactivate_otp_verify"
app:popUpTo="@id/connectid_message" />
app:popUpTo="@id/personalid_message_display" />
<action
android:id="@+id/action_connectid_message_self"
app:destination="@id/connectid_message" />
app:destination="@id/personalid_message_display" />
<action
android:id="@+id/action_connectid_message_to_connectid_secondary_phone_fragment"
app:destination="@id/connectid_secondary_phone_fragment"
app:popUpTo="@id/connectid_signup_fragment"
app:popUpTo="@id/personalid_phone_fragment"
app:popUpToInclusive="true"/>
<argument
android:name="title"
Expand Down Expand Up @@ -172,26 +172,26 @@
</dialog>

<fragment
android:id="@+id/connectid_pin"
android:name="org.commcare.fragments.connectId.ConnectIdPinFragment"
android:label="fragment_connectid_pin"
android:id="@+id/personalid_backup_code"
android:name="org.commcare.fragments.connectId.PersonalIdBackupCodeFragment"
android:label="fragment_personalid_pin"
tools:layout="@layout/fragment_recovery_code">
<action
android:id="@+id/action_connectid_pin_to_connectid_phone_verify"
app:destination="@id/connectid_phone_verify"
app:popUpTo="@id/connectid_pin" />
app:destination="@id/personalid_otp_page"
app:popUpTo="@id/personalid_backup_code" />
<action
android:id="@+id/action_connectid_pin_to_connectid_message"
app:destination="@id/connectid_message"
app:popUpTo="@id/connectid_pin" />
app:destination="@id/personalid_message_display"
app:popUpTo="@id/personalid_backup_code" />
<action
android:id="@+id/action_connectid_pin_self"
app:destination="@id/connectid_pin"
app:popUpTo="@id/connectid_pin" />
app:destination="@id/personalid_backup_code"
app:popUpTo="@id/personalid_backup_code" />
<action
android:id="@+id/action_connectid_pin_to_connectid_password"
app:destination="@id/connectid_password"
app:popUpTo="@id/connectid_pin" />
app:popUpTo="@id/personalid_backup_code" />
<action
android:id="@+id/action_connectid_pin_to_connectid_secondary_phone_fragment"
app:destination="@id/connectid_secondary_phone_fragment" />
Expand All @@ -217,25 +217,25 @@
app:argType="boolean" />
<action
android:id="@+id/action_connectid_pin_to_connectid_signup_fragment"
app:destination="@id/connectid_signup_fragment" />
app:destination="@id/personalid_phone_fragment" />
</fragment>

<fragment
android:id="@+id/connectid_password"
android:name="org.commcare.fragments.connectId.ConnectIdPasswordVerificationFragment"
android:name="org.commcare.fragments.connectId.PersonalIdPasswordVerificationFragment"
android:label="fragment_connectid_password"
tools:layout="@layout/screen_connect_password_verify">
<action
android:id="@+id/action_connectid_password_to_connectid_message"
app:destination="@id/connectid_message"
app:destination="@id/personalid_message_display"
app:popUpTo="@id/connectid_password" />
<action
android:id="@+id/action_connectid_password_to_connectid_phone_verify"
app:destination="@id/connectid_phone_verify"
app:destination="@id/personalid_otp_page"
app:popUpTo="@id/connectid_password" />
<action
android:id="@+id/action_connectid_password_to_connectid_pin"
app:destination="@id/connectid_pin"
app:destination="@id/personalid_backup_code"
app:popUpTo="@id/connectid_password" />
<argument
android:name="phone"
Expand All @@ -251,14 +251,14 @@
app:nullable="false" />
<action
android:id="@+id/action_connectid_password_to_connectid_signup_fragment"
app:destination="@id/connectid_signup_fragment" />
app:destination="@id/personalid_phone_fragment" />
</fragment>

<fragment
android:id="@+id/connectid_signup_fragment"
android:name="org.commcare.fragments.connectId.ConnectIDSignupFragment"
android:id="@+id/personalid_phone_fragment"
android:name="org.commcare.fragments.connectId.PersonalIdPhoneFragment"
android:label="fragment_connectid_signup_fragment"
tools:layout="@layout/fragment_signup">
tools:layout="@layout/screen_personalid_phoneno">
<argument
android:name="callingClass"
android:defaultValue="1002"
Expand All @@ -273,19 +273,19 @@
app:destination="@id/connectid_phone_not_available" />
<action
android:id="@+id/action_connectid_phone_fragment_to_connectid_biometric_config"
app:destination="@id/connectid_biometric_config" />
app:destination="@id/personalid_biometric_config" />
<action
android:id="@+id/action_connectid_phone_fragment_to_connectid_message"
app:destination="@id/connectid_message" />
app:destination="@id/personalid_message_display" />
<action
android:id="@+id/action_connectid_phone_fragment_to_connectid_password"
app:destination="@id/connectid_password" />
<action
android:id="@+id/action_connectid_phone_fragment_to_connectid_pin"
app:destination="@id/connectid_pin" />
app:destination="@id/personalid_backup_code" />
<action
android:id="@+id/action_connectid_signup_fragment_self"
app:destination="@id/connectid_signup_fragment" />
app:destination="@id/personalid_phone_fragment" />
<action
android:id="@+id/action_connectid_signup_fragment_to_connectid_secondary_phone_fragment"
app:destination="@id/connectid_secondary_phone_fragment" />
Expand All @@ -298,13 +298,13 @@
tools:layout="@layout/fragment_secondary_phone_number">
<action
android:id="@+id/action_connectid_secondary_phone_fragment_to_connectid_phone_verify"
app:destination="@id/connectid_phone_verify" />
app:destination="@id/personalid_otp_page" />
<action
android:id="@+id/action_connectid_secondary_phone_fragment_to_connectid_message"
app:destination="@id/connectid_message" />
app:destination="@id/personalid_message_display" />
<action
android:id="@+id/action_connectid_secondary_phone_fragment_to_connectid_pin"
app:destination="@id/connectid_pin" />
app:destination="@id/personalid_backup_code" />
<argument
android:name="callingClass"
app:argType="integer"
Expand All @@ -318,7 +318,7 @@
tools:layout="@layout/screen_connect_user_deactivate_otp_verify">
<action
android:id="@+id/action_connectid_user_deactivate_otp_verify_to_connectid_message"
app:destination="@id/connectid_message" />
app:destination="@id/personalid_message_display" />
<argument
android:name="primaryPhone"
app:argType="string"
Expand All @@ -340,7 +340,7 @@
tools:layout="@layout/screen_connect_primary_phone">
<action
android:id="@+id/action_connectid_phoneNo_to_connectid_phone_verify"
app:destination="@id/connectid_phone_verify"
app:destination="@id/personalid_otp_page"
app:popUpTo="@id/connectid_phoneNo" />
<argument
android:name="phone"
Expand Down
Loading
Loading