From 17b00734ac8db3990ac395f0df7d7538ee51396d Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Fri, 15 Jul 2022 13:18:38 -0300 Subject: [PATCH] Update contact name editor. --- .../contactshare/ContactNameEditActivity.java | 14 +-- .../ContactNameEditViewModel.java | 4 - .../res/layout/activity_contact_name_edit.xml | 99 +++++++++++++------ app/src/main/res/values/strings.xml | 2 + app/src/main/res/values/styles.xml | 9 ++ 5 files changed, 82 insertions(+), 46 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java index 67f5c5650..8eb185e74 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java @@ -7,11 +7,10 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.appcompat.widget.Toolbar; -import androidx.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProvider; import org.thoughtcrime.securesms.PassphraseRequiredActivity; import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.util.DynamicLanguage; import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme; import org.thoughtcrime.securesms.util.DynamicTheme; @@ -22,10 +21,8 @@ public class ContactNameEditActivity extends PassphraseRequiredActivity { public static final String KEY_NAME = "name"; public static final String KEY_CONTACT_INDEX = "contact_index"; - private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme(); - private final DynamicLanguage dynamicLanguage = new DynamicLanguage(); + private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme(); - private TextView displayNameView; private ContactNameEditViewModel viewModel; static Intent getIntent(@NonNull Context context, @NonNull Name name, int contactPosition) { @@ -38,7 +35,6 @@ public class ContactNameEditActivity extends PassphraseRequiredActivity { @Override protected void onPreCreate() { dynamicTheme.onCreate(this); - dynamicLanguage.onCreate(this); } @Override @@ -59,16 +55,14 @@ public class ContactNameEditActivity extends PassphraseRequiredActivity { initializeToolbar(); initializeViews(name); - viewModel = ViewModelProviders.of(this).get(ContactNameEditViewModel.class); + viewModel = new ViewModelProvider(this).get(ContactNameEditViewModel.class); viewModel.setName(name); - viewModel.getDisplayName().observe(this, displayNameView::setText); } @Override protected void onResume() { super.onResume(); dynamicTheme.onResume(this); - dynamicLanguage.onResume(this); } private void initializeToolbar() { @@ -86,8 +80,6 @@ public class ContactNameEditActivity extends PassphraseRequiredActivity { } private void initializeViews(@NonNull Name name) { - displayNameView = findViewById(R.id.name_edit_display_name); - TextView givenName = findViewById(R.id.name_edit_given_name); TextView familyName = findViewById(R.id.name_edit_family_name); TextView middleName = findViewById(R.id.name_edit_middle_name); diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java index 191e43e96..b1433dc36 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java @@ -39,10 +39,6 @@ public class ContactNameEditViewModel extends ViewModel { return new Name(displayName.getValue(), givenName, familyName, prefix, suffix, middleName); } - LiveData getDisplayName() { - return displayName; - } - void updateGivenName(@NonNull String givenName) { this.givenName = givenName; displayName.postValue(buildDisplayName()); diff --git a/app/src/main/res/layout/activity_contact_name_edit.xml b/app/src/main/res/layout/activity_contact_name_edit.xml index b4fa04c56..af708a4b5 100644 --- a/app/src/main/res/layout/activity_contact_name_edit.xml +++ b/app/src/main/res/layout/activity_contact_name_edit.xml @@ -2,19 +2,19 @@ + android:layout_height="@dimen/signal_m3_toolbar_height" + android:minHeight="@dimen/signal_m3_toolbar_height" + app:navigationIcon="@drawable/ic_x" + app:title="@string/ContactShareEditActivity__edit_name" + app:titleTextAppearance="@style/Signal.Text.TitleLarge" /> + android:orientation="vertical"> - + android:layout_marginBottom="16dp" + android:minHeight="56dp"> - + + + + + android:layout_marginBottom="16dp" + android:minHeight="56dp"> - + + + + android:layout_marginBottom="16dp" + android:minHeight="56dp"> - + + + + android:layout_marginBottom="16dp" + android:minHeight="56dp"> - + + - + android:layout_height="wrap_content"> + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 418667be7..da3de2047 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -210,6 +210,8 @@ Signal Call %s + + Edit name Given name Family name Prefix diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index b5594e0c1..71b03b85a 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -482,6 +482,15 @@ @color/signal_text_hint + +