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

Resolved conflicts.

Browse Source
This commit is contained in:
Niels Zwemmer
2017-06-23 20:39:57 +02:00
parent da765832f1 a71fc80f59
commit 83d2bda5c1
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java
View File

@@ -113,6 +113,7 @@ public class MainActivity extends AppCompatActivity implements CameraFragment.On
FragmentManager man = getFragmentManager(); FragmentManager man = getFragmentManager();
ProfileFragment frag = (ProfileFragment) man.findFragmentById(R.id.content); ProfileFragment frag = (ProfileFragment) man.findFragmentById(R.id.content);
FragmentTransaction transaction = man.beginTransaction(); FragmentTransaction transaction = man.beginTransaction();
frag.progressDialog.dismiss();
transaction.detach(frag) transaction.detach(frag)
.attach(frag) .attach(frag)
.commit(); .commit();

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

@@ -42,7 +42,8 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
protected TextView profileName; protected TextView profileName;
protected ImageView profilePicture; protected ImageView profilePicture;
protected FirebaseUser user; protected FirebaseUser user;
private ProgressDialog progressDialog; ProgressDialog progressDialog;
/// Required empty public constructor /// /// Required empty public constructor ///