search

owncloud / android

:phone: The ownCloud Android App
GNU General Public License v2.0
3.85k stars 3.06k forks source link

Feature/add text labels bottom nav bar #4497

Closed Yogeshjindal closed 1 month ago

Yogeshjindal commented 1 month ago

Added text labels to the bottom nav bar Used default activeStateIndicator which will show which label is selected

Now, all the items in nav bar shows the labels and upon selection the activeIndicator is enabled which shows that which item is selected. Fix#4484

JuancaG05 commented 1 month ago

A quick explanation about removing commits so that you learn for a future too:

  1. Using the Terminal from Android Studio, run the command:

    git rebase -i HEAD~5

    The number that goes together with HEAD is the number of commits you want to work with, but since this PR has 4, 5 is enough

  2. Replace pick by drop in those commits you want to discard (remember this is a vim editor, you have to use arrows to move, i to enter writing mode and Esc to exit the writing mode)

  3. Exit the writing mode, write :wq and press Enter

  4. Run the command to push it to GitHub (-f because otherwise you won't be able to push it since it will detect conflicts):

    git push -f

After this, you should have in this PR only the commits we want and I'll be able to review it again 😊

Yogeshjindal commented 1 month ago

@JuancaG05 Sir,Thanks a lot for sharing this valuable information.

JuancaG05 commented 1 month ago

Hi @Yogeshjindal, I see there are more and more commits, but none of them are following conventional commits guidelines as I indicated. Also, there are lots of commits and most of them are not useful. Rebase is not properly done as well, you merged master into this branch and that's not what's supposed to happen 😅.

Please, refer to this comment https://github.com/owncloud/android/pull/4497#issuecomment-2407332140 where I explain how to remove commits, and leave this PR with just the needed commits written in conventional commits style. Otherwise, I will be forced to close this PR since it doesn't follow the required guidelines 😞.