Paul profile #6

Merged
11306084 merged 29 commits from paul-profile into master 2017-06-22 11:39:39 +02:00
3 changed files with 52 additions and 30 deletions
Showing only changes of commit 72003c75ff - Show all commits

View File

@@ -26,11 +26,14 @@ dependencies {
})
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:design:25.3.1'
compile 'com.google.firebase:firebase-database:10.0.1'
compile 'com.google.firebase:firebase-auth:10.0.1'
compile 'com.google.firebase:firebase-database:11.0.1'
compile 'com.google.firebase:firebase-auth:11.0.1'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.android.support:support-v4:25.3.1'
compile 'com.google.firebase:firebase-storage:10.0.1'
compile 'com.google.firebase:firebase-storage:11.0.1'
// FirebaseUI Storage only
compile 'com.firebaseui:firebase-ui-storage:2.0.1'
testCompile 'junit:junit:4.12'
}

View File

@@ -11,8 +11,16 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.ImageView;
import com.bumptech.glide.Glide;
import com.firebase.ui.storage.images.FirebaseImageLoader;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseUser;
import com.google.firebase.storage.FirebaseStorage;
import com.google.firebase.storage.StorageReference;
import com.google.firebase.auth.FirebaseAuth;
/**
@@ -41,6 +49,9 @@ public class ProfileFragment extends Fragment implements View.OnClickListener{
// Required empty public constructor
}
protected StorageReference httpsReference;
protected ImageView profilePicture;
/**
* Use this factory method to create a new instance of
* this fragment using the provided parameters.
@@ -66,6 +77,11 @@ public class ProfileFragment extends Fragment implements View.OnClickListener{
mParam1 = getArguments().getString(ARG_PARAM1);
mParam2 = getArguments().getString(ARG_PARAM2);
}
FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
if (user != null) {
httpsReference = FirebaseStorage.getInstance().getReferenceFromUrl(user.getPhotoUrl().toString());
}
}
/**
@@ -73,6 +89,7 @@ public class ProfileFragment extends Fragment implements View.OnClickListener{
*/
protected void findViews(View view) {
profilePicButton = (Button) view.findViewById(R.id.profile_pic_button);
profilePicture = (ImageView) view.findViewById(R.id.imageView_profile_picture);
bindOnClick();
}
@@ -86,6 +103,7 @@ public class ProfileFragment extends Fragment implements View.OnClickListener{
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_profile, container, false);
findViews(view);
Glide.with(this).using(new FirebaseImageLoader()).load(httpsReference).into(profilePicture);
return view;
}

View File

@@ -5,42 +5,43 @@
android:layout_height="match_parent"
tools:context="nl.myhyvesbookplus.tagram.ProfileFragment">
<LinearLayout
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<ScrollView
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
<TextView
android:id="@+id/profile-name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:gravity="center_horizontal"
android:textSize="25sp"
android:textStyle="bold"
android:text="Name:" />
<Button
android:id="@+id/logout_button"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:onClick="logOutOnClick"
android:text="@string/logout_button" />
<Button
android:id="@+id/logout_button"
android:layout_width="match_parent"
android:layout_height="50dp"
android:onClick="logOutOnClick"
android:text="@string/logout_button" />
<ImageView
android:id="@+id/imageView_profile_picture"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
app:srcCompat="@drawable/ic_account_box_black_24dp" />
<ImageView
android:id="@+id/imageView_profile_picture"
android:layout_width="match_parent"
android:layout_height="300dp"
app:srcCompat="@drawable/ic_account_box_black_24dp" />
<Button
android:id="@+id/profile_pic_button"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:text="@string/profile_picture_button" />
<Button
android:id="@+id/profile_pic_button"
android:layout_width="match_parent"
android:layout_height="50dp"
android:text="@string/profile_picture_button" />
</LinearLayout>
</ScrollView>
</LinearLayout>
</LinearLayout>
</ScrollView>
</FrameLayout>