Feat: User details in nav header and New User Profile Activity #78

Hiteshgautam01 · 2018-05-25T22:54:04Z

Please make sure these boxes are checked before submitting your pull request - thanks!

Apply the AndroidStyle.xml style template to your code in Android Studio.
Run the checks with ./gradlew check to make sure you didn't break anything
If you have multiple commits please combine them into one commit by squashing them.

Hiteshgautam01 · 2018-05-25T23:13:39Z

UI after changes

Hiteshgautam01 · 2018-05-26T13:12:33Z

app/src/main/java/org/apache/taverna/mobile/ui/UserProfileActivity.java

+                @Override
+                public void onClick(View v) {
+                    //In this onClick listener we have to go from this UserProfileActivity to myWorkflows fragment.
+                    //Suggest the method to perform this action.


Hey @sagar15795 , Suggest the best possible method to perform this action

UserProfile -> myWorkflow and myWorkflow -> UserProfile. So make a separate activity for myworkflow and just show the myworkflow fragment in it.

sagar15795

@Hiteshgautam01 where did you find nav_header.png? What is its license and copyright?

sagar15795 · 2018-05-26T11:32:26Z

app/build.gradle

@@ -86,6 +86,7 @@ dependencies {

    //Dependencies for butterknife
    implementation "com.jakewharton:butterknife:$rootProject.butterKnifeVersion"
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0'


remove this unused library.

sagar15795 · 2018-05-26T17:22:09Z

app/src/main/java/org/apache/taverna/mobile/ui/UserProfileActivity.java

+    Toolbar mToolbar;
+
+    @BindView(R.id.user_name)
+    TextView user_name;


Use camel notation for the variable name. Also, use m prefix for all class variables.

sagar15795

@Hiteshgautam01 this PR is not up to the mark. Please change the requested change. And Also, before submitting the PR please read this guideline by ribot which we are trying to follow in this project. And also change only that code which is required not which is not required.

sagar15795 · 2018-06-03T06:57:46Z

app/build.gradle

@@ -68,6 +68,7 @@ dependencies {
    implementation "com.android.support:support-v4:$rootProject.supportLibraryVersion"
    implementation "com.android.support:support-annotations:$rootProject.supportLibraryVersion"

+    implementation 'com.android.support:design:27.1.0'


We are already using this library.
Check below line.

sagar15795 · 2018-06-03T06:58:00Z

app/build.gradle

@@ -86,6 +87,7 @@ dependencies {

    //Dependencies for butterknife
    implementation "com.jakewharton:butterknife:$rootProject.butterKnifeVersion"
+    implementation 'com.android.support:support-v4:27.1.1'


We are already using this library.
Check below line.

sagar15795 · 2018-06-03T06:59:17Z

app/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--


remove all unwanted changes from the whole file.

sagar15795 · 2018-06-03T06:59:56Z

app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java

@@ -271,6 +284,44 @@ private void signOut() {
        finish();
    }

+    private void setNavHeader() {
+        NavigationView navigationView =  findViewById(R.id.nav_view);


use butterknife for this.

sagar15795 · 2018-06-03T07:00:29Z

app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java

@@ -271,6 +284,44 @@ private void signOut() {
        finish();
    }

+    private void setNavHeader() {
+        NavigationView navigationView =  findViewById(R.id.nav_view);
+        View header_view =  navigationView.getHeaderView(0);


make it headeView in place of header_view

sagar15795 · 2018-06-03T07:05:59Z

app/src/main/java/org/apache/taverna/mobile/ui/userprofile/UserProfileFragment.java

+            }
+        });
+
+        myFavoriteWorkflowLayout.setOnClickListener(new View.OnClickListener() {


use butterknife @onClick annotation for click listener.

sagar15795 · 2018-06-03T07:07:23Z

app/src/main/java/org/apache/taverna/mobile/ui/userprofile/UserProfileFragment.java

+        String city = dataManager.getPreferencesHelper().getUserCity();
+        String country = dataManager.getPreferencesHelper().getUserCountry();
+
+        String avatar = dataManager.getPreferencesHelper().getUserAvatar();


make avatar to avatarUrl

sagar15795 · 2018-06-03T07:10:57Z

app/src/main/res/layout/fragment_user_profile.xml

+                    android:layout_centerInParent="true"
+                    android:layout_alignParentTop="true"
+                    app:civ_border_color="@color/white"
+                    />


move this to above line.

sagar15795 · 2018-06-03T07:11:12Z

app/src/main/res/layout/fragment_user_profile.xml

+                    android:layout_below="@+id/user_avatar"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="@dimen/user_name_margin_top"
+                    />


move this to above line

sagar15795 · 2018-06-03T07:13:10Z

app/src/main/res/layout/fragment_user_profile.xml

+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                >


move this to above line

sagar15795

@Hiteshgautam01 Please fix this also. Let me know when you will be done with it. So that I can run it on the device before merging to the project.

sagar15795 · 2018-06-03T17:23:07Z

app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java

+    private void setNavHeader() {
+
+        View headerView =  navigationView.getHeaderView(0);
+        String avatar = dataManager.getPreferencesHelper().getUserAvatar();


make avatar to avatarUrl and getUserAvatar() to getUserAvatarUrl()

sagar15795 · 2018-06-03T17:24:43Z

...src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsActivity.java

+        if (actionbar != null) {
+            actionbar.setHomeButtonEnabled(true);
+            actionbar.setDisplayHomeAsUpEnabled(true);
+            actionbar.setTitle("Favourite Workflows");


move "Favourite Workflows"to string.xml

sagar15795 · 2018-06-03T17:25:19Z

app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowsActivity.java

+        if (actionbar != null) {
+            actionbar.setHomeButtonEnabled(true);
+            actionbar.setDisplayHomeAsUpEnabled(true);
+            actionbar.setTitle("My Workflows");


move "My Workflows" to string.xml

sagar15795 · 2018-06-03T17:26:07Z

app/src/main/java/org/apache/taverna/mobile/ui/userprofile/UserProfileActivity.java

+        if (actionbar != null) {
+            actionbar.setHomeButtonEnabled(true);
+            actionbar.setDisplayHomeAsUpEnabled(true);
+            actionbar.setTitle("Profile");


move "Profile" to string.xml

sagar15795 · 2018-06-03T17:27:50Z

app/src/main/java/org/apache/taverna/mobile/ui/userprofile/UserProfileFragment.java

+
+        dataManager = new DataManager(new PreferencesHelper(getContext()));
+
+        String name = dataManager.getPreferencesHelper().getUserName();


use userName in place of name

sagar15795 · 2018-06-03T17:35:02Z

app/src/main/res/layout/fragment_user_profile.xml

+                        android:id="@+id/user_country"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text=""


remove this.

sagar15795 · 2018-06-03T17:36:20Z

app/src/main/res/layout/nav_header.xml

 -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="178dp"


@sagar15795 ,Because if I set this to wrap content, the image will stretch in the length and hide the nav drawer due to its size.

Then make it 170dp

sagar15795 · 2018-06-03T17:36:52Z

app/src/main/res/layout/nav_header.xml

+		android:text="@string/username"
+		android:textSize="@dimen/tv_textSize"
+		android:textStyle="bold"
+		/>


move the close tag above

sagar15795 · 2018-06-03T17:37:14Z

app/src/main/res/layout/nav_header.xml

+		android:text="@string/email"
+		android:textSize="@dimen/tv_textSize"
+		android:textStyle="normal"
+		/>


move the close tag above

sagar15795 · 2018-06-03T17:38:27Z

app/src/main/res/layout/nav_header.xml

+		android:layout_marginLeft="@dimen/user_image_margin_left"
+		android:layout_marginTop="@dimen/user_image_margin_top"
+		app:civ_border_color="@color/white"
+		/>


move the close tag above

sagar15795

@Hiteshgautam01 Please change the requested change and let me know.

sagar15795 · 2018-06-04T03:45:01Z

app/src/main/java/org/apache/taverna/mobile/ui/userprofile/UserProfileFragment.java

+    TextView UserCity;
+
+    @BindView(R.id.user_country)
+    TextView UserCountry;


make it userCountry or mUserCountry. And all the above also.

sagar15795 · 2018-06-04T03:46:03Z

app/src/main/java/org/apache/taverna/mobile/ui/userprofile/UserProfileFragment.java

+
+    private DataManager dataManager;
+
+    public static UserProfileFragment newInstance(String id) {


have you used this function? Please delete it if you are not using it.

Hiteshgautam01 commented May 26, 2018

View reviewed changes

sagar15795 suggested changes May 26, 2018

View reviewed changes

Hiteshgautam01 force-pushed the user_profile_nav branch 2 times, most recently from 22f7f4c to 60b361a Compare June 2, 2018 09:18

sagar15795 suggested changes Jun 3, 2018

View reviewed changes

Hiteshgautam01 force-pushed the user_profile_nav branch 8 times, most recently from 8cbd4f5 to 4181eda Compare June 3, 2018 08:56

sagar15795 suggested changes Jun 3, 2018

View reviewed changes

Hiteshgautam01 force-pushed the user_profile_nav branch 3 times, most recently from a413634 to 535a25b Compare June 3, 2018 19:10

sagar15795 suggested changes Jun 4, 2018

View reviewed changes

Hiteshgautam01 force-pushed the user_profile_nav branch from 535a25b to e67cabd Compare June 4, 2018 06:42

Feat: User details in nav header and New User Profile Activity

e072d3b

Hiteshgautam01 force-pushed the user_profile_nav branch from e67cabd to e072d3b Compare June 4, 2018 10:04

asfgit merged commit e072d3b into apache:master Jun 5, 2018

asfgit pushed a commit that referenced this pull request Jun 5, 2018

This Close #78

eff6351

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat: User details in nav header and New User Profile Activity #78

Feat: User details in nav header and New User Profile Activity #78

Hiteshgautam01 commented May 25, 2018 •

edited

Hiteshgautam01 commented May 25, 2018 •

edited

Hiteshgautam01 May 26, 2018

sagar15795 May 26, 2018

sagar15795 left a comment

sagar15795 May 26, 2018 •

edited

sagar15795 May 26, 2018

sagar15795 left a comment •

edited

sagar15795 Jun 3, 2018

sagar15795 Jun 3, 2018

sagar15795 Jun 3, 2018

sagar15795 Jun 3, 2018

sagar15795 Jun 3, 2018

sagar15795 Jun 3, 2018

sagar15795 Jun 3, 2018

sagar15795 Jun 3, 2018

sagar15795 Jun 3, 2018

sagar15795 Jun 3, 2018

sagar15795 left a comment

sagar15795 Jun 3, 2018

sagar15795 Jun 3, 2018

sagar15795 Jun 3, 2018

sagar15795 Jun 3, 2018

sagar15795 Jun 3, 2018

sagar15795 Jun 3, 2018

sagar15795 Jun 3, 2018

Hiteshgautam01 Jun 3, 2018 •

edited

sagar15795 Jun 4, 2018

sagar15795 Jun 3, 2018

sagar15795 Jun 3, 2018

sagar15795 Jun 3, 2018

sagar15795 left a comment

sagar15795 Jun 4, 2018

sagar15795 Jun 4, 2018


		dataManager = new DataManager(new PreferencesHelper(getContext()));

		String name = dataManager.getPreferencesHelper().getUserName();


		private DataManager dataManager;

		public static UserProfileFragment newInstance(String id) {

Feat: User details in nav header and New User Profile Activity #78

Feat: User details in nav header and New User Profile Activity #78

Conversation

Hiteshgautam01 commented May 25, 2018 • edited

Hiteshgautam01 commented May 25, 2018 • edited

UI after changes

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sagar15795 left a comment

Choose a reason for hiding this comment

sagar15795 May 26, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sagar15795 left a comment • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sagar15795 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Hiteshgautam01 Jun 3, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sagar15795 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Hiteshgautam01 commented May 25, 2018 •

edited

Hiteshgautam01 commented May 25, 2018 •

edited

sagar15795 May 26, 2018 •

edited

sagar15795 left a comment •

edited

Hiteshgautam01 Jun 3, 2018 •

edited