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

Add back arrow to profile editor.

Browse Source
This commit is contained in:
Alex Hart 2020-01-27 14:30:53 -04:00 committed by GitHub
parent 0aad82d3d7
commit c86ced0911
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +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";
private final DynamicTheme dynamicTheme = new DynamicRegistrationTheme(); private final DynamicTheme dynamicTheme = new DynamicRegistrationTheme();

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

@ -23,6 +23,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import androidx.annotation.StringRes; import androidx.annotation.StringRes;
import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import androidx.navigation.NavDirections; import androidx.navigation.NavDirections;
@ -52,11 +53,13 @@ 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;
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 ImageView avatar; private ImageView avatar;
private CircularProgressButton finishButton; private CircularProgressButton finishButton;
private EditText givenName; private EditText givenName;
@ -187,6 +190,7 @@ public class EditProfileFragment extends Fragment {
private void initializeResources(@NonNull View view) { private void initializeResources(@NonNull View view) {
Bundle arguments = requireArguments(); Bundle arguments = requireArguments();
this.toolbar = view.findViewById(R.id.toolbar);
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);
@ -231,6 +235,11 @@ public class EditProfileFragment extends Fragment {
NavDirections action = EditProfileFragmentDirections.actionEditUsername(); NavDirections action = EditProfileFragmentDirections.actionEditUsername();
Navigation.findNavController(v).navigate(action); Navigation.findNavController(v).navigate(action);
}); });
if (arguments.getBoolean(SHOW_BACK_ARROW, true)) {
this.toolbar.setVisibility(View.VISIBLE);
this.toolbar.setNavigationOnClickListener(v -> requireActivity().finish());
}
} }
private void initializeProfileName() { private void initializeProfileName() {

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

@ -31,7 +31,11 @@ public final class RegistrationCompleteFragment extends BaseRegistrationFragment
FragmentActivity activity = requireActivity(); FragmentActivity activity = requireActivity();
if (!isReregister()) { if (!isReregister()) {
activity.startActivity(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);
activity.startActivity(setProfileNameIntent);
} }
activity.finish(); activity.finish();

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

@ -22,6 +22,16 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:navigationIcon="@drawable/ic_arrow_left_24" />
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
style="@style/TextAppearance.Signal.Title2" style="@style/TextAppearance.Signal.Title2"