Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Some unrelated code changes to avatar settings

Browse Source
This commit is contained in:
Torsten Grote
2021-02-23 10:29:51 -03:00
parent 5a424b178e
commit 737ecfb620
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
briar-android/src/main/java/org/briarproject/briar/android/settings/ConfirmAvatarDialogFragment.java
View File

@@ -32,7 +32,7 @@ public class ConfirmAvatarDialogFragment extends DialogFragment {
@Inject @Inject
ViewModelProvider.Factory viewModelFactory; ViewModelProvider.Factory viewModelFactory;
private SettingsViewModel settingsViewModel; private SettingsViewModel viewModel;
private static final String ARG_URI = "uri"; private static final String ARG_URI = "uri";
private Uri uri; private Uri uri;
@@ -51,6 +51,9 @@ public class ConfirmAvatarDialogFragment extends DialogFragment {
public void onAttach(Context ctx) { public void onAttach(Context ctx) {
super.onAttach(ctx); super.onAttach(ctx);
((BaseActivity) requireActivity()).getActivityComponent().inject(this); ((BaseActivity) requireActivity()).getActivityComponent().inject(this);
ViewModelProvider provider =
new ViewModelProvider(requireActivity(), viewModelFactory);
viewModel = provider.get(SettingsViewModel.class);
} }
@Override @Override
@@ -60,32 +63,27 @@ public class ConfirmAvatarDialogFragment extends DialogFragment {
uri = Uri.parse(argUri); uri = Uri.parse(argUri);
FragmentActivity activity = requireActivity(); FragmentActivity activity = requireActivity();
LayoutInflater inflater = LayoutInflater.from(activity);
ViewModelProvider provider =
new ViewModelProvider(activity, viewModelFactory);
settingsViewModel = provider.get(SettingsViewModel.class);
AlertDialog.Builder builder =
new AlertDialog.Builder(activity, R.style.BriarDialogTheme);
LayoutInflater inflater = LayoutInflater.from(getContext());
final View view = final View view =
inflater.inflate(R.layout.fragment_confirm_avatar_dialog, null); inflater.inflate(R.layout.fragment_confirm_avatar_dialog, null);
builder.setView(view);
builder.setTitle(R.string.dialog_confirm_profile_picture_title);
builder.setNegativeButton(R.string.cancel, null);
builder.setPositiveButton(R.string.change,
(dialog, id) -> settingsViewModel.setAvatar(uri));
ImageView imageView = view.findViewById(R.id.image); ImageView imageView = view.findViewById(R.id.image);
imageView.setImageURI(uri);
TextView textViewUserName = view.findViewById(R.id.username); TextView textViewUserName = view.findViewById(R.id.username);
settingsViewModel.getOwnIdentityInfo().observe(activity,
us -> textViewUserName.setText(us.getLocalAuthor().getName()));
return builder.create(); // we can't use getViewLifecycleOwner() here
// as this fragment technically doesn't have a view
viewModel.getOwnIdentityInfo().observe(activity, us ->
textViewUserName.setText(us.getLocalAuthor().getName())
);
int theme = R.style.BriarDialogTheme;
return new AlertDialog.Builder(activity, theme)
.setView(view)
.setTitle(R.string.dialog_confirm_profile_picture_title)
.setNegativeButton(R.string.cancel, null)
.setPositiveButton(R.string.change, (d, id) ->
viewModel.setAvatar(uri)
)
.create();
} }
} }

2
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java
View File

@@ -79,7 +79,7 @@ class SettingsViewModel extends AndroidViewModel {
return ownIdentityInfo; return ownIdentityInfo;
} }
public LiveEvent<Boolean> getSetAvatarFailed() { LiveEvent<Boolean> getSetAvatarFailed() {
return setAvatarFailed; return setAvatarFailed;
} }