MyHyvesBookPlus/TheReturnOfTheMyHyvesBookPlus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Marijn appje #28

Merged
11166932 merged 27 commits from marijn-appje into master 2017-06-29 13:34:35 +02:00
Conversation 3 Commits 27 Files Changed 26 +5 -4
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3aab463143 - Show all commits

6
app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
View File

@@ -146,7 +146,7 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
try {
photoFile = createImageFile();
} catch (IOException ex) {
Toast.makeText(getActivity(), getString(R.string.image_save_error), Toast.LENGTH_LONG);
Toast.makeText(getActivity(), getString(R.string.image_save_error), Toast.LENGTH_LONG).show();
}
if (photoFile != null) {
Uri photoURI = FileProvider.getUriForFile(getActivity(),
@@ -213,8 +213,8 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
@Override
public void onComplete(@NonNull Task<Void> task) {
Toast.makeText(getActivity(), task.isSuccessful()
? "An e-mail was sent, please follow its instructions."
: "An error occurred, please check internet connection.",
? getString(R.string.mail_successful)
: getString(R.string.mail_failed),
Toast.LENGTH_SHORT).show();
}
});

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

@@ -31,4 +31,5 @@
<string name="update_profile_pic_error">Het updaten van de profielfoto is mislukt. Controleer uw internetverbinding.</string>
<string name="upload_profile_pic">Profielfoto aan het uploaden…</string>
<string name="niet_slecht">"\"Niet slecht.\"s "</string>
<string name="mail_success">An e-mail was sent, please follow its instructions.</string>
</resources>

2
app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
View File

@@ -29,5 +29,5 @@
<string name="mail_failed">An error occurred. Please check internet connection.</string>
<string name="image_save_error">Saving image to storage failed. Please make sure there is space available on the device.</string>
<string name="update_profile_pic_error">Updating the profile picture failed. Please check network connection.</string>
<string name="upload_profile_pic">Uploading profile picture...</string>
<string name="upload_profile_pic">Uploading profile picture…</string>
</resources>