Fixes #171 Fix Lint errors/warnings: global, coding style: add missing spaces #1955

poranje · 2018-10-26T14:24:32Z

global, coding style: add missing spaces

Fixes #{GitHub issue number and title (Please do not forget adding title) }

Description (required)

Fixes #171 (partially)

Tests performed (required)

none

codecov-io · 2018-10-26T14:51:41Z

Codecov Report

Merging #1955 into master will not change coverage.
The diff coverage is 0%.

@@          Coverage Diff           @@
##           master   #1955   +/-   ##
======================================
  Coverage    4.37%   4.37%           
======================================
  Files         211     211           
  Lines       10634   10634           
  Branches      954     954           
======================================
  Hits          465     465           
  Misses      10134   10134           
  Partials       35      35

Impacted Files	Coverage Δ
...ree/nrw/commons/concurrency/ThreadPoolService.java	`54.28% <ø> (ø)`	⬆️
.../fr/free/nrw/commons/widget/PicOfDayAppWidget.java	`0% <ø> (ø)`	⬆️
...ava/fr/free/nrw/commons/utils/UriDeserializer.java	`0% <ø> (ø)`	⬆️
...va/fr/free/nrw/commons/ui/widget/HtmlTextView.java	`0% <ø> (ø)`	⬆️
...ain/java/fr/free/nrw/commons/nearby/Sitelinks.java	`0% <ø> (ø)`	⬆️
...ree/nrw/commons/di/CommonsDaggerIntentService.java	`0% <ø> (ø)`	⬆️
...fr/free/nrw/commons/settings/SettingsActivity.java	`61.11% <ø> (ø)`	⬆️
...nrw/commons/di/CommonsDaggerAppCompatActivity.java	`72.72% <ø> (ø)`	⬆️
...ree/nrw/commons/notification/NotificationType.java	`0% <ø> (ø)`	⬆️
.../free/nrw/commons/nearby/NearbyAdapterFactory.java	`0% <ø> (ø)`	⬆️
... and 57 more

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 27123f5...484aac2. Read the comment docs.

…nto addspaces

domdomegg

Thanks for the pull request! I've made a bunch of suggestions for other if statement fixes and resolved some merge conflicts.

Please can you

Review my suggestions
Test the new code. I know we shouldn't have broken anything but it's always worth double checking the core functions of the app when making such wide-reaching changes (almost 70 files!)

domdomegg · 2018-11-01T22:09:31Z

app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java

                    bottomSheetBehaviorForDetails.setState(BottomSheetBehavior.STATE_HIDDEN);
                    bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
-                }else if(bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_EXPANDED){
+                }else if (bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_EXPANDED){


Suggested change

}else if (bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_EXPANDED){

} else if (bottomSheetBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {

domdomegg · 2018-11-01T22:10:15Z

app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java

@@ -195,10 +195,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
        // Handle item selection
        switch (item.getItemId()) {
            case R.id.action_display_list:
-                if(bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_COLLAPSED || bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_HIDDEN){
+                if (bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_COLLAPSED || bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_HIDDEN){


Suggested change

if (bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_COLLAPSED || bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_HIDDEN){

if (bottomSheetBehavior.getState() == BottomSheetBehavior.STATE_COLLAPSED || bottomSheetBehavior.getState() == BottomSheetBehavior.STATE_HIDDEN) {

domdomegg · 2018-11-01T22:10:44Z

app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java

@@ -281,7 +281,7 @@ private void updateMapToTrackPosition() {

                // Make camera to follow user on location change
                CameraPosition position ;
-                if(ViewUtil.isPortrait(getActivity())){
+                if (ViewUtil.isPortrait(getActivity())){


Suggested change

if (ViewUtil.isPortrait(getActivity())){

if (ViewUtil.isPortrait(getActivity())) {

domdomegg · 2018-11-01T22:11:02Z

app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java

@@ -416,7 +416,7 @@ private void setListeners() {
                mapView.getMapAsync(mapboxMap -> {
                    CameraPosition position;

-                    if(ViewUtil.isPortrait(getActivity())){
+                    if (ViewUtil.isPortrait(getActivity())){


Suggested change

if (ViewUtil.isPortrait(getActivity())){

if (ViewUtil.isPortrait(getActivity())) {

domdomegg · 2018-11-01T22:11:19Z

app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java

@@ -87,7 +87,7 @@ private void refresh() {
    private void addNotifications() {
        Timber.d("Add notifications");

-        if(mNotificationWorkerFragment == null){
+        if (mNotificationWorkerFragment == null){


Suggested change

if (mNotificationWorkerFragment == null){

if (mNotificationWorkerFragment == null) {

domdomegg · 2018-11-01T22:14:47Z

app/src/main/java/fr/free/nrw/commons/explore/categories/SearchCategoryFragment.java

@@ -95,7 +95,7 @@ private void saveQuery(String query) {
    public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
        View rootView = inflater.inflate(R.layout.fragment_browse_image, container, false);
        ButterKnife.bind(this, rootView);
-        if(getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT){
+        if (getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT){


Suggested change

if (getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT){

if (getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {

domdomegg · 2018-11-01T22:14:56Z

app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java

@@ -97,7 +97,7 @@ private void saveQuery(String query) {
    public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
        View rootView = inflater.inflate(R.layout.fragment_browse_image, container, false);
        ButterKnife.bind(this, rootView);
-        if(getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT){
+        if (getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT){


Suggested change

if (getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT){

if (getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {

domdomegg · 2018-11-01T22:15:12Z

app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java

@@ -418,14 +418,14 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {

    @OnClick(R.id.seeMore)
    public void onSeeMoreClicked(){
-        if(nominatedForDeletion.getVisibility()== VISIBLE) {
+        if (nominatedForDeletion.getVisibility()== VISIBLE) {


Suggested change

if (nominatedForDeletion.getVisibility()== VISIBLE) {

if (nominatedForDeletion.getVisibility() == VISIBLE) {

domdomegg · 2018-11-01T22:15:23Z

app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java

@@ -156,7 +156,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                viewIntent.setAction(ACTION_VIEW);
                viewIntent.setData(m.getFilePageTitle().getMobileUri());
                //check if web browser available
-                if(viewIntent.resolveActivity(getActivity().getPackageManager()) != null){
+                if (viewIntent.resolveActivity(getActivity().getPackageManager()) != null){


Suggested change

if (viewIntent.resolveActivity(getActivity().getPackageManager()) != null){

if (viewIntent.resolveActivity(getActivity().getPackageManager()) != null) {

domdomegg · 2018-11-01T22:15:37Z

app/src/main/java/fr/free/nrw/commons/mwapi/CustomMwApi.java

@@ -58,7 +58,7 @@ public RequestBuilder action(String action) {
    }

    public String getAuthCookie() {
-        if(authCookie == null){
+        if (authCookie == null){


Suggested change

if (authCookie == null){

if (authCookie == null) {

domdomegg · 2018-11-04T13:57:09Z

Tested tutorial, login, home, media detail view, nearby, explore, notifications, settings, about page.
2.8.5-debug-pr-1955~484aac2c on Samsung Galaxy S6 with API level 25.

Results

All okay

inserted missi^C spaces between if and (

e2c9c1c

poranje and others added 3 commits October 26, 2018 23:16

inserted missing spaces between if and (

a3aa573

Merge branch 'addspaces' of github.com:poranje/apps-android-commons i…

c5b6979

…nto addspaces

Merge branch 'master' into addspaces

145b0f2

domdomegg requested changes Nov 1, 2018

View reviewed changes

domdomegg self-assigned this Nov 4, 2018

domdomegg approved these changes Nov 4, 2018

View reviewed changes

Merge branch 'master' into addspaces

484aac2

domdomegg mentioned this pull request Nov 4, 2018

Clicking middle text of a notification row has an inconsistent darkening animation to icon and date #1980

Closed

domdomegg merged commit 7b7d17a into commons-app:master Nov 4, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #171 Fix Lint errors/warnings: global, coding style: add missing spaces #1955

Fixes #171 Fix Lint errors/warnings: global, coding style: add missing spaces #1955

poranje commented Oct 26, 2018

codecov-io commented Oct 26, 2018 •

edited

Loading

domdomegg left a comment

domdomegg Nov 1, 2018

domdomegg Nov 1, 2018

domdomegg Nov 1, 2018

domdomegg Nov 1, 2018

domdomegg Nov 1, 2018

domdomegg Nov 1, 2018

domdomegg Nov 1, 2018

domdomegg Nov 1, 2018

domdomegg Nov 1, 2018

domdomegg Nov 1, 2018

domdomegg commented Nov 4, 2018

	}else if (bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_EXPANDED){
	} else if (bottomSheetBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {

	if (bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_COLLAPSED \|\| bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_HIDDEN){
	if (bottomSheetBehavior.getState() == BottomSheetBehavior.STATE_COLLAPSED \|\| bottomSheetBehavior.getState() == BottomSheetBehavior.STATE_HIDDEN) {

	if (ViewUtil.isPortrait(getActivity())){
	if (ViewUtil.isPortrait(getActivity())) {

	if (mNotificationWorkerFragment == null){
	if (mNotificationWorkerFragment == null) {

	if (getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT){
	if (getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {

	if (nominatedForDeletion.getVisibility()== VISIBLE) {
	if (nominatedForDeletion.getVisibility() == VISIBLE) {

	if (viewIntent.resolveActivity(getActivity().getPackageManager()) != null){
	if (viewIntent.resolveActivity(getActivity().getPackageManager()) != null) {

Fixes #171 Fix Lint errors/warnings: global, coding style: add missing spaces #1955

Fixes #171 Fix Lint errors/warnings: global, coding style: add missing spaces #1955

Conversation

poranje commented Oct 26, 2018

global, coding style: add missing spaces

Description (required)

Tests performed (required)

codecov-io commented Oct 26, 2018 • edited Loading

Codecov Report

domdomegg 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

domdomegg commented Nov 4, 2018

codecov-io commented Oct 26, 2018 •

edited

Loading