Skip to content

Commit d9ff114

Browse files
StypoxStypox
authored
Merge pull request TeamNewPipe#8601 from litetex/checkstyle-assign-on-same-line
Checkstyle assign on same line
2 parents a1c6f00 + 3ba04f1 commit d9ff114

40 files changed

Lines changed: 194 additions & 445 deletions

‎app/src/main/java/com/google/android/material/appbar/FlingBehavior.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ private Field getLastNestedScrollingChildRefField() {
132132
try {
133133
final Class<?> headerBehaviorType = this.getClass().getSuperclass().getSuperclass();
134134
if (headerBehaviorType != null) {
135-
final Field field
136-
= headerBehaviorType.getDeclaredField("lastNestedScrollingChildRef");
135+
final Field field =
136+
headerBehaviorType.getDeclaredField("lastNestedScrollingChildRef");
137137
field.setAccessible(true);
138138
return field;
139139
}

‎app/src/main/java/org/schabi/newpipe/DownloaderImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
import okhttp3.ResponseBody;
2727

2828
public final class DownloaderImpl extends Downloader {
29-
public static final String USER_AGENT
30-
= "Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0";
31-
public static final String YOUTUBE_RESTRICTED_MODE_COOKIE_KEY
32-
= "youtube_restricted_mode_key";
29+
public static final String USER_AGENT =
30+
"Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0";
31+
public static final String YOUTUBE_RESTRICTED_MODE_COOKIE_KEY =
32+
"youtube_restricted_mode_key";
3333
public static final String YOUTUBE_RESTRICTED_MODE_COOKIE = "PREF=f2=8000000";
3434
public static final String YOUTUBE_DOMAIN = "youtube.com";
3535

‎app/src/main/java/org/schabi/newpipe/MainActivity.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,8 @@ protected void onResume() {
473473
ErrorUtil.showUiErrorSnackbar(this, "Setting up service toggle", e);
474474
}
475475

476-
final SharedPreferences sharedPreferences
477-
= PreferenceManager.getDefaultSharedPreferences(this);
476+
final SharedPreferences sharedPreferences =
477+
PreferenceManager.getDefaultSharedPreferences(this);
478478
if (sharedPreferences.getBoolean(Constants.KEY_THEME_CHANGE, false)) {
479479
if (DEBUG) {
480480
Log.d(TAG, "Theme has changed, recreating activity...");
@@ -646,8 +646,8 @@ public boolean onCreateOptionsMenu(final Menu menu) {
646646
}
647647
super.onCreateOptionsMenu(menu);
648648

649-
final Fragment fragment
650-
= getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
649+
final Fragment fragment =
650+
getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
651651
if (!(fragment instanceof SearchFragment)) {
652652
toolbarLayoutBinding.toolbarSearchContainer.getRoot().setVisibility(View.GONE);
653653
}

‎app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package org.schabi.newpipe.download;
22

3+
import static org.schabi.newpipe.extractor.stream.DeliveryMethod.PROGRESSIVE_HTTP;
4+
import static org.schabi.newpipe.util.ListHelper.getStreamsOfSpecifiedDelivery;
5+
import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
6+
37
import android.app.Activity;
48
import android.content.ComponentName;
59
import android.content.Context;
@@ -82,10 +86,6 @@
8286
import us.shandian.giga.service.DownloadManagerService.DownloadManagerBinder;
8387
import us.shandian.giga.service.MissionState;
8488

85-
import static org.schabi.newpipe.extractor.stream.DeliveryMethod.PROGRESSIVE_HTTP;
86-
import static org.schabi.newpipe.util.ListHelper.getStreamsOfSpecifiedDelivery;
87-
import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
88-
8989
public class DownloadDialog extends DialogFragment
9090
implements RadioGroup.OnCheckedChangeListener, AdapterView.OnItemSelectedListener {
9191
private static final String TAG = "DialogFragment";
@@ -205,8 +205,8 @@ public void onCreate(@Nullable final Bundle savedInstanceState) {
205205
setStyle(STYLE_NO_TITLE, ThemeHelper.getDialogTheme(context));
206206
Icepick.restoreInstanceState(this, savedInstanceState);
207207

208-
final SparseArray<SecondaryStreamHelper<AudioStream>> secondaryStreams
209-
= new SparseArray<>(4);
208+
final SparseArray<SecondaryStreamHelper<AudioStream>> secondaryStreams =
209+
new SparseArray<>(4);
210210
final List<VideoStream> videoStreams = wrappedVideoStreams.getStreamsList();
211211

212212
for (int i = 0; i < videoStreams.size(); i++) {

‎app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ public class ErrorActivity extends AppCompatActivity {
6565
public static final String ERROR_EMAIL_ADDRESS = "crashreport@newpipe.schabi.org";
6666
public static final String ERROR_EMAIL_SUBJECT = "Exception in ";
6767

68-
public static final String ERROR_GITHUB_ISSUE_URL
69-
= "https://github.com/TeamNewPipe/NewPipe/issues";
68+
public static final String ERROR_GITHUB_ISSUE_URL =
69+
"https://github.com/TeamNewPipe/NewPipe/issues";
7070

71-
public static final DateTimeFormatter CURRENT_TIMESTAMP_FORMATTER
72-
= DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
71+
public static final DateTimeFormatter CURRENT_TIMESTAMP_FORMATTER =
72+
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
7373

7474

7575
private ErrorInfo errorInfo;

‎app/src/main/java/org/schabi/newpipe/fragments/detail/DescriptionFragment.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package org.schabi.newpipe.fragments.detail;
22

3+
import static android.text.TextUtils.isEmpty;
4+
import static org.schabi.newpipe.extractor.stream.StreamExtractor.NO_AGE_LIMIT;
5+
import static org.schabi.newpipe.extractor.utils.Utils.isBlank;
6+
37
import android.os.Bundle;
48
import android.view.LayoutInflater;
59
import android.view.View;
@@ -33,10 +37,6 @@
3337
import icepick.State;
3438
import io.reactivex.rxjava3.disposables.CompositeDisposable;
3539

36-
import static android.text.TextUtils.isEmpty;
37-
import static org.schabi.newpipe.extractor.stream.StreamExtractor.NO_AGE_LIMIT;
38-
import static org.schabi.newpipe.extractor.utils.Utils.isBlank;
39-
4040
public class DescriptionFragment extends BaseFragment {
4141

4242
@State
@@ -185,8 +185,8 @@ private void addMetadataItem(final LayoutInflater inflater,
185185
return;
186186
}
187187

188-
final ItemMetadataBinding itemBinding
189-
= ItemMetadataBinding.inflate(inflater, layout, false);
188+
final ItemMetadataBinding itemBinding =
189+
ItemMetadataBinding.inflate(inflater, layout, false);
190190

191191
itemBinding.metadataTypeView.setText(type);
192192
itemBinding.metadataTypeView.setOnLongClickListener(v -> {
@@ -206,8 +206,8 @@ private void addMetadataItem(final LayoutInflater inflater,
206206

207207
private void addTagsMetadataItem(final LayoutInflater inflater, final LinearLayout layout) {
208208
if (streamInfo.getTags() != null && !streamInfo.getTags().isEmpty()) {
209-
final ItemMetadataTagsBinding itemBinding
210-
= ItemMetadataTagsBinding.inflate(inflater, layout, false);
209+
final ItemMetadataTagsBinding itemBinding =
210+
ItemMetadataTagsBinding.inflate(inflater, layout, false);
211211

212212
final List<String> tags = new ArrayList<>(streamInfo.getTags());
213213
Collections.sort(tags);

‎app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1555,8 +1555,8 @@ public void handleResult(@NonNull final StreamInfo info) {
15551555
binding.detailUploaderThumbnailView.setVisibility(View.GONE);
15561556
}
15571557

1558-
final Drawable buddyDrawable
1559-
= AppCompatResources.getDrawable(activity, R.drawable.placeholder_person);
1558+
final Drawable buddyDrawable =
1559+
AppCompatResources.getDrawable(activity, R.drawable.placeholder_person);
15601560
binding.detailSubChannelThumbnailView.setImageDrawable(buddyDrawable);
15611561
binding.detailUploaderThumbnailView.setImageDrawable(buddyDrawable);
15621562

@@ -2030,6 +2030,7 @@ private void hideSystemUi() {
20302030
}
20312031

20322032
// Listener implementation
2033+
@Override
20332034
public void hideSystemUiIfNeeded() {
20342035
if (isFullscreen()
20352036
&& bottomSheetBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {

‎app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ public View buildView(@NonNull final ViewGroup parent, @NonNull final InfoItem i
6767
public View buildView(@NonNull final ViewGroup parent, @NonNull final InfoItem infoItem,
6868
final HistoryRecordManager historyRecordManager,
6969
final boolean useMiniVariant) {
70-
final InfoItemHolder holder
71-
= holderFromInfoType(parent, infoItem.getInfoType(), useMiniVariant);
70+
final InfoItemHolder holder =
71+
holderFromInfoType(parent, infoItem.getInfoType(), useMiniVariant);
7272
holder.updateFromItem(infoItem, historyRecordManager);
7373
return holder.itemView;
7474
}

‎app/src/main/java/org/schabi/newpipe/info_list/dialog/StreamDialogDefaultEntry.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ public enum StreamDialogDefaultEntry {
115115
DOWNLOAD(R.string.download, (fragment, item) ->
116116
fetchStreamInfoAndSaveToDatabase(fragment.requireContext(), item.getServiceId(),
117117
item.getUrl(), info -> {
118-
final DownloadDialog downloadDialog
119-
= new DownloadDialog(fragment.requireContext(), info);
118+
final DownloadDialog downloadDialog =
119+
new DownloadDialog(fragment.requireContext(), info);
120120
downloadDialog.show(fragment.getChildFragmentManager(), "downloadDialog");
121121
})
122122
),

‎app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import org.schabi.newpipe.util.DeviceUtils;
2424
import org.schabi.newpipe.util.Localization;
2525
import org.schabi.newpipe.util.NavigationHelper;
26-
import org.schabi.newpipe.util.external_communication.TimestampExtractor;
27-
import org.schabi.newpipe.util.external_communication.ShareUtils;
2826
import org.schabi.newpipe.util.PicassoHelper;
27+
import org.schabi.newpipe.util.external_communication.ShareUtils;
28+
import org.schabi.newpipe.util.external_communication.TimestampExtractor;
2929

3030
import java.util.regex.Matcher;
3131

@@ -204,8 +204,9 @@ private void ellipsize() {
204204
boolean hasEllipsis = false;
205205

206206
if (itemContentView.getLineCount() > COMMENT_DEFAULT_LINES) {
207-
final int endOfLastLine
208-
= itemContentView.getLayout().getLineEnd(COMMENT_DEFAULT_LINES - 1);
207+
final int endOfLastLine = itemContentView
208+
.getLayout()
209+
.getLineEnd(COMMENT_DEFAULT_LINES - 1);
209210
int end = itemContentView.getText().toString().lastIndexOf(' ', endOfLastLine - 2);
210211
if (end == -1) {
211212
end = Math.max(endOfLastLine - 2, 0);

0 commit comments

Comments
 (0)