TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 17:58:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change profile preference screen to use toolbar.

Browse Source
This commit is contained in:
Alex Hart 2020-01-28 13:40:54 -04:00
parent 5221b6fb43
commit e3878ffde7
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileActivity.java
View File

@ -19,7 +19,7 @@ public class EditProfileActivity extends BaseActionBarActivity implements EditPr
public static final String EXCLUDE_SYSTEM = "exclude_system"; public static final String EXCLUDE_SYSTEM = "exclude_system";
public static final String DISPLAY_USERNAME = "display_username"; public static final String DISPLAY_USERNAME = "display_username";
public static final String NEXT_BUTTON_TEXT = "next_button_text"; public static final String NEXT_BUTTON_TEXT = "next_button_text";
public static final String SHOW_BACK_ARROW = "show_back_arrow"; public static final String SHOW_TOOLBAR = "show_back_arrow";
private final DynamicTheme dynamicTheme = new DynamicRegistrationTheme(); private final DynamicTheme dynamicTheme = new DynamicRegistrationTheme();

7
app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java
View File

@ -53,13 +53,14 @@ import static org.thoughtcrime.securesms.profiles.edit.EditProfileActivity.DISPL
import static org.thoughtcrime.securesms.profiles.edit.EditProfileActivity.EXCLUDE_SYSTEM; import static org.thoughtcrime.securesms.profiles.edit.EditProfileActivity.EXCLUDE_SYSTEM;
import static org.thoughtcrime.securesms.profiles.edit.EditProfileActivity.NEXT_BUTTON_TEXT; import static org.thoughtcrime.securesms.profiles.edit.EditProfileActivity.NEXT_BUTTON_TEXT;
import static org.thoughtcrime.securesms.profiles.edit.EditProfileActivity.NEXT_INTENT; import static org.thoughtcrime.securesms.profiles.edit.EditProfileActivity.NEXT_INTENT;
import static org.thoughtcrime.securesms.profiles.edit.EditProfileActivity.SHOW_BACK_ARROW; import static org.thoughtcrime.securesms.profiles.edit.EditProfileActivity.SHOW_TOOLBAR;
public class EditProfileFragment extends Fragment { public class EditProfileFragment extends Fragment {
private static final String TAG = Log.tag(EditProfileFragment.class); private static final String TAG = Log.tag(EditProfileFragment.class);
private Toolbar toolbar; private Toolbar toolbar;
private View title;
private ImageView avatar; private ImageView avatar;
private CircularProgressButton finishButton; private CircularProgressButton finishButton;
private EditText givenName; private EditText givenName;
@ -191,6 +192,7 @@ public class EditProfileFragment extends Fragment {
Bundle arguments = requireArguments(); Bundle arguments = requireArguments();
this.toolbar = view.findViewById(R.id.toolbar); this.toolbar = view.findViewById(R.id.toolbar);
this.title = view.findViewById(R.id.title);
this.avatar = view.findViewById(R.id.avatar); this.avatar = view.findViewById(R.id.avatar);
this.givenName = view.findViewById(R.id.given_name); this.givenName = view.findViewById(R.id.given_name);
this.familyName = view.findViewById(R.id.family_name); this.familyName = view.findViewById(R.id.family_name);
@ -236,9 +238,10 @@ public class EditProfileFragment extends Fragment {
Navigation.findNavController(v).navigate(action); Navigation.findNavController(v).navigate(action);
}); });
if (arguments.getBoolean(SHOW_BACK_ARROW, true)) { if (arguments.getBoolean(SHOW_TOOLBAR, true)) {
this.toolbar.setVisibility(View.VISIBLE); this.toolbar.setVisibility(View.VISIBLE);
this.toolbar.setNavigationOnClickListener(v -> requireActivity().finish()); this.toolbar.setNavigationOnClickListener(v -> requireActivity().finish());
this.title.setVisibility(View.GONE);
} }
} }

2
app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.java
View File

@ -33,7 +33,7 @@ public final class RegistrationCompleteFragment extends BaseRegistrationFragment
if (!isReregister()) { if (!isReregister()) {
Intent setProfileNameIntent = getRoutedIntent(activity, EditProfileActivity.class, new Intent(activity, MainActivity.class)); Intent setProfileNameIntent = getRoutedIntent(activity, EditProfileActivity.class, new Intent(activity, MainActivity.class));
setProfileNameIntent.putExtra(EditProfileActivity.SHOW_BACK_ARROW, false); setProfileNameIntent.putExtra(EditProfileActivity.SHOW_TOOLBAR, false);
activity.startActivity(setProfileNameIntent); activity.startActivity(setProfileNameIntent);
} }

6
app/src/main/res/layout/profile_create_fragment.xml
View File

@ -30,7 +30,8 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:navigationIcon="@drawable/ic_arrow_left_24" /> app:navigationIcon="@drawable/ic_arrow_left_24"
app:title="@string/CreateProfileActivity__profile" />
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
@ -58,7 +59,8 @@
android:tint="@color/core_grey_05" android:tint="@color/core_grey_05"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title" /> app:layout_constraintTop_toBottomOf="@+id/title"
app:layout_goneMarginTop="?attr/actionBarSize" />
<ImageView <ImageView
android:id="@+id/avatar_placeholder" android:id="@+id/avatar_placeholder"

1
app/src/main/res/values/strings.xml
View File

@ -312,6 +312,7 @@
<string name="ConversationTitleView_verified">Verified</string> <string name="ConversationTitleView_verified">Verified</string>
<!-- CreateProfileActivity --> <!-- CreateProfileActivity -->
<string name="CreateProfileActivity__profile">Profile</string>
<string name="CreateProfileActivity_error_setting_profile_photo">Error setting profile photo</string> <string name="CreateProfileActivity_error_setting_profile_photo">Error setting profile photo</string>
<string name="CreateProfileActivity_problem_setting_profile">Problem setting profile</string> <string name="CreateProfileActivity_problem_setting_profile">Problem setting profile</string>
<string name="CreateProfileActivity_profile_photo">Profile photo</string> <string name="CreateProfileActivity_profile_photo">Profile photo</string>