Fixes #3191 Make the username along with the rewards icon clickable in the Navigation Drawer #3283

ajuancer · 2019-12-07T08:03:23Z

Implementing call to the AchievementsActivity.java when the user name is pressed as it occurs when the rewards icon is pressed.

Fixes #3191 Make the username along with the rewards icon clickable in the Navigation Drawer.

What changes did you make and why?
Set an onClick listener on the user name textview and make the listener have the same action as that of the trophy icon, in order to make navigation easier.

Tests performed (required)
Tested on Android 10.

Note: Please ensure that you have read CONTRIBUTING.md if this is your first pull request.

Click on user name open AchievmentsActivity

When TextView username is clicked

codecov-io · 2019-12-07T08:15:52Z

Codecov Report

Merging #3283 into master will decrease coverage by <.01%.
The diff coverage is 0%.

@@            Coverage Diff            @@
##           master   #3283      +/-   ##
=========================================
- Coverage     7.5%    7.5%   -0.01%     
=========================================
  Files         255     255              
  Lines       11199   11205       +6     
  Branches      892     892              
=========================================
  Hits          841     841              
- Misses      10296   10302       +6     
  Partials       62      62

Impacted Files	Coverage Δ
...free/nrw/commons/theme/NavigationBaseActivity.java	`0% <0%> (ø)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b0be497...3fbcf03. Read the comment docs.

FlorianSW · 2019-12-08T16:18:01Z

app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java

@@ -139,6 +139,11 @@ private void setUserName() {
            drawerLayout.closeDrawer(navigationView);
            AchievementsActivity.startYourself(NavigationBaseActivity.this);
        });
+        TextView userName = navHeaderView.findViewById(R.id.username);
+        userName.setOnClickListener(v -> {


I think it would make sense to somehow extract the onclick listener to a method or something, so that you do not simply need to duplicate the code, but instead call a function :)

ajuancer · 2019-12-08T16:40:41Z

@FlorianSW suggests implementing a specific method. This method is called makeClickable

neslihanturan

Thanks @ajuancer , it works for me:)

neslihanturan · 2019-12-09T10:38:59Z

Just a small issue, can you please add Javadocs for the method you just added?

yashk2000

Looks good 👍
Just add the javadocs for the new method please.

To add the javadocs, type /** on the line above the new makeClickable methods and press enter.

Now it can change to any activity, not just AchievementsActivity. For this reason, startYourself() of AchievmentsActivity should be deleted.

ajuancer · 2019-12-09T13:00:43Z

Javadoc included, and method modified to work with other activities, maybe it could replace the respective methods that exit in each activity to change from one to it, what do you think?

ajuancer · 2019-12-09T13:08:31Z

This change has also been tested in Android 10 and works perfectly!

yashk2000 · 2019-12-09T14:53:58Z

@ajuancer please correct the issue number you fixed and the pr title.
You've fixed #3191 but have mentioned #3192 in your templated by mistake.
Please take care of this small detail.
Rest looks good 🚀

yashk2000 · 2019-12-10T11:19:45Z

@ajuancer #3191 is "Make the username along with the rewards icon clickable in the Navigation Drawer", not "Improve the share message of the app". Please update the main pr title and the fixes line of the pr template too where you've written "Improve the share message of the app".

yashk2000

Thanks for the work @ajuancer. Looks good now 🎉

FlorianSW

Not quite happy with the name of the method, but because of my lack of a better one in my head, it's ok :D Thanks for working on that! Looks good.

maskaravivek · 2019-12-16T08:34:21Z

app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java

@@ -135,9 +135,23 @@ private void setUserName() {
            username.setText(allAccounts[0].name);
        }
        ImageView userIcon = navHeaderView.findViewById(R.id.user_icon);
-        userIcon.setOnClickListener(v -> {
+        makeClickable(userIcon, NavigationBaseActivity.this, AchievementsActivity.class);


Instead of adding event listeners on both the views separately wrap the icon and name in a Linearlayout and add a listener to it.

maskaravivek · 2019-12-16T08:35:01Z

app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java

+     * @param actualContext The context of actual activity.
+     * @param activity The activity to launch.
+     */
+    public void makeClickable(View pressedView, Context actualContext, Class activity){


Based on the first comment this change won't be needed. U can continue using

AchievementsActivity.startYourself()

macgills · 2020-05-14T10:15:33Z

fixed by #3401

ajuancer added 2 commits December 7, 2019 08:58

Merge pull request #1 from commons-app/master

d48e839

Click on user name open AchievmentsActivity

Implementing call to AchievementsActivity.java

14dddb4

When TextView username is clicked

ajuancer closed this Dec 7, 2019

ajuancer reopened this Dec 7, 2019

FlorianSW reviewed Dec 8, 2019

View reviewed changes

ajuancer closed this Dec 8, 2019

Implementing call to AchievementsActivity.jav

d786d92

ajuancer reopened this Dec 8, 2019

nicolas-raoul changed the title ~~Merge pull request #1 from commons-app/master~~ Implementing call to the AchievementsActivity.java when the user name is pressed as it occurs when the rewards icon is pressed Dec 9, 2019

neslihanturan changed the title ~~Implementing call to the AchievementsActivity.java when the user name is pressed as it occurs when the rewards icon is pressed~~ Fixes #3192 Improve the share message of the app Dec 9, 2019

neslihanturan approved these changes Dec 9, 2019

View reviewed changes

yashk2000 reviewed Dec 9, 2019

View reviewed changes

Making makeClickable() more generic

3fbcf03

Now it can change to any activity, not just AchievementsActivity. For this reason, startYourself() of AchievmentsActivity should be deleted.

ajuancer changed the title ~~Fixes #3192 Improve the share message of the app~~ Fixes #3191 Improve the share message of the app Dec 9, 2019

ajuancer changed the title ~~Fixes #3191 Improve the share message of the app~~ Fixes #3191 Make the username along with the rewards icon clickable in the Navigation Drawer Dec 10, 2019

yashk2000 approved these changes Dec 10, 2019

View reviewed changes

FlorianSW approved these changes Dec 12, 2019

View reviewed changes

maskaravivek requested changes Dec 16, 2019

View reviewed changes

macgills closed this May 14, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #3191 Make the username along with the rewards icon clickable in the Navigation Drawer #3283

Fixes #3191 Make the username along with the rewards icon clickable in the Navigation Drawer #3283

ajuancer commented Dec 7, 2019 •

edited

Loading

codecov-io commented Dec 7, 2019 •

edited

Loading

FlorianSW Dec 8, 2019

ajuancer commented Dec 8, 2019

neslihanturan left a comment

neslihanturan commented Dec 9, 2019

yashk2000 left a comment

ajuancer commented Dec 9, 2019 •

edited

Loading

ajuancer commented Dec 9, 2019

yashk2000 commented Dec 9, 2019

yashk2000 commented Dec 10, 2019

yashk2000 left a comment

FlorianSW left a comment

maskaravivek Dec 16, 2019

maskaravivek Dec 16, 2019

macgills commented May 14, 2020

Fixes #3191 Make the username along with the rewards icon clickable in the Navigation Drawer #3283

Fixes #3191 Make the username along with the rewards icon clickable in the Navigation Drawer #3283

Conversation

ajuancer commented Dec 7, 2019 • edited Loading

codecov-io commented Dec 7, 2019 • edited Loading

Codecov Report

FlorianSW Dec 8, 2019

Choose a reason for hiding this comment

ajuancer commented Dec 8, 2019

neslihanturan left a comment

Choose a reason for hiding this comment

neslihanturan commented Dec 9, 2019

yashk2000 left a comment

Choose a reason for hiding this comment

ajuancer commented Dec 9, 2019 • edited Loading

ajuancer commented Dec 9, 2019

yashk2000 commented Dec 9, 2019

yashk2000 commented Dec 10, 2019

yashk2000 left a comment

Choose a reason for hiding this comment

FlorianSW left a comment

Choose a reason for hiding this comment

maskaravivek Dec 16, 2019

Choose a reason for hiding this comment

maskaravivek Dec 16, 2019

Choose a reason for hiding this comment

macgills commented May 14, 2020

ajuancer commented Dec 7, 2019 •

edited

Loading

codecov-io commented Dec 7, 2019 •

edited

Loading

ajuancer commented Dec 9, 2019 •

edited

Loading