mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 07:05:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #11194 from nextcloud/fix/random-lint

Browse source 
fix/random lint
This commit is contained in:
Álvaro Brey 2023-01-09 15:01:45 +01:00 committed by GitHub
commit 1c7ffffe03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 63 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

138
app/src/main/java/com/owncloud/android/media/MediaControlView.java
View file

@ -30,16 +30,14 @@ import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo;
import android.widget.FrameLayout;
import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.MediaController.MediaPlayerControl;
import android.widget.ProgressBar;
import android.widget.SeekBar;
import android.widget.SeekBar.OnSeekBarChangeListener;
import android.widget.TextView;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.databinding.MediaControlBinding;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.utils.theme.ViewThemeUtils;
@ -56,19 +54,13 @@ import javax.inject.Inject;
* <p>
* It synchronizes itself with the state of the {@link MediaPlayer}.
*/
public class MediaControlView extends FrameLayout implements OnClickListener, OnSeekBarChangeListener {
public class MediaControlView extends LinearLayout implements OnClickListener, OnSeekBarChangeListener {
private static final String TAG = MediaControlView.class.getSimpleName();
private static final int SHOW_PROGRESS = 1;
private MediaPlayerControl playerControl;
private final View root;
private ProgressBar progressBar;
private TextView endTime;
private TextView currentTime;
private final MediaControlBinding binding;
private boolean isDragging;
private ImageButton pauseButton;
private ImageButton forwardButton;
private ImageButton rewindButton;
@Inject
ViewThemeUtils viewThemeUtils;
@ -80,14 +72,9 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On
MainApp.getAppComponent().inject(this);
FrameLayout.LayoutParams frameParams = new FrameLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT
);
LayoutInflater inflate = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
root = inflate.inflate(R.layout.media_control, null);
initControllerView(root);
addView(root, frameParams);
binding = MediaControlBinding.inflate(inflate, this, true);
initControllerView();
setFocusable(true);
setFocusableInTouchMode(true);
@ -103,7 +90,7 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On
public void setMediaPlayer(MediaPlayerControl player) {
playerControl = player;
handler.sendEmptyMessage(SHOW_PROGRESS);
handler.postDelayed(()-> {
handler.postDelayed(() -> {
updatePausePlay();
setProgress();
}, 100);
@ -113,37 +100,17 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On
handler.removeMessages(SHOW_PROGRESS);
}
private void initControllerView(View v) {
pauseButton = v.findViewById(R.id.playBtn);
if (pauseButton != null) {
pauseButton.requestFocus();
pauseButton.setOnClickListener(this);
}
private void initControllerView() {
binding.playBtn.requestFocus();
binding.playBtn.setOnClickListener(this);
forwardButton = v.findViewById(R.id.forwardBtn);
if (forwardButton != null) {
forwardButton.setOnClickListener(this);
}
binding.forwardBtn.setOnClickListener(this);
rewindButton = v.findViewById(R.id.rewindBtn);
if (rewindButton != null) {
rewindButton.setOnClickListener(this);
}
binding.rewindBtn.setOnClickListener(this);
progressBar = v.findViewById(R.id.progressBar);
if (progressBar != null) {
if (progressBar instanceof SeekBar) {
SeekBar seeker = (SeekBar) progressBar;
viewThemeUtils.platform.themeHorizontalSeekBar(seeker);
seeker.setOnSeekBarChangeListener(this);
} else {
viewThemeUtils.platform.themeHorizontalProgressBar(progressBar);
}
progressBar.setMax(1000);
}
endTime = v.findViewById(R.id.totalTimeText);
currentTime = v.findViewById(R.id.currentTimeText);
viewThemeUtils.platform.themeHorizontalSeekBar(binding.progressBar);
binding.progressBar.setOnSeekBarChangeListener(this);
binding.progressBar.setMax(1000);
}
/**
@ -152,15 +119,18 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On
*/
private void disableUnsupportedButtons() {
try {
if (pauseButton != null && !playerControl.canPause()) {
pauseButton.setEnabled(false);
}
if (rewindButton != null && !playerControl.canSeekBackward()) {
rewindButton.setEnabled(false);
}
if (forwardButton != null && !playerControl.canSeekForward()) {
forwardButton.setEnabled(false);
if (binding != null) {
if (!playerControl.canPause()) {
binding.playBtn.setEnabled(false);
}
if (!playerControl.canSeekBackward()) {
binding.rewindBtn.setEnabled(false);
}
if (!playerControl.canSeekForward()) {
binding.forwardBtn.setEnabled(false);
}
}
} catch (IncompatibleClassChangeError ex) {
// We were given an old version of the interface, that doesn't have
// the canPause/canSeekXYZ methods. This is OK, it just means we
@ -205,23 +175,20 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On
}
int position = playerControl.getCurrentPosition();
int duration = playerControl.getDuration();
if (progressBar != null) {
if (binding != null) {
if (duration > 0) {
// use long to avoid overflow
long pos = 1000L * position / duration;
progressBar.setProgress((int) pos);
binding.progressBar.setProgress((int) pos);
}
int percent = playerControl.getBufferPercentage();
progressBar.setSecondaryProgress(percent * 10);
binding.progressBar.setSecondaryProgress(percent * 10);
String endTime = duration > 0 ? formatTime(duration) : "--:--";
binding.totalTimeText.setText(endTime);
binding.currentTimeText.setText(formatTime(position));
}
if (endTime != null) {
String endTime = duration > 0 ? formatTime(duration) : "--:--";
this.endTime.setText(endTime);
}
if (currentTime != null) {
currentTime.setText(formatTime(position));
}
return position;
}
@ -236,8 +203,8 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On
if (uniqueDown) {
doPauseResume();
//show(sDefaultTimeout);
if (pauseButton != null) {
pauseButton.requestFocus();
if (binding != null) {
binding.playBtn.requestFocus();
}
}
return true;
@ -260,28 +227,28 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On
}
public void updatePausePlay() {
if (root == null || pauseButton == null) {
if (binding == null) {
return;
}
if (playerControl.isPlaying()) {
pauseButton.setImageResource(android.R.drawable.ic_media_pause);
binding.playBtn.setImageResource(android.R.drawable.ic_media_pause);
} else {
pauseButton.setImageResource(android.R.drawable.ic_media_play);
binding.playBtn.setImageResource(android.R.drawable.ic_media_play);
}
final boolean canSeekFfd = playerControl.canSeekForward();
if (canSeekFfd) {
forwardButton.setVisibility(View.VISIBLE);
binding.forwardBtn.setVisibility(View.VISIBLE);
} else {
forwardButton.setVisibility(View.INVISIBLE);
binding.forwardBtn.setVisibility(View.INVISIBLE);
}
final boolean canSeekBwd = playerControl.canSeekBackward();
if (canSeekBwd) {
rewindButton.setVisibility(View.VISIBLE);
binding.rewindBtn.setVisibility(View.VISIBLE);
} else {
rewindButton.setVisibility(View.INVISIBLE);
binding.rewindBtn.setVisibility(View.INVISIBLE);
}
}
@ -296,18 +263,13 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On
@Override
public void setEnabled(boolean enabled) {
if (pauseButton != null) {
pauseButton.setEnabled(enabled);
}
if (forwardButton != null) {
forwardButton.setEnabled(enabled);
}
if (rewindButton != null) {
rewindButton.setEnabled(enabled);
}
if (progressBar != null) {
progressBar.setEnabled(enabled);
if(binding!=null){
binding.playBtn.setEnabled(enabled);
binding.forwardBtn.setEnabled(enabled);
binding.rewindBtn.setEnabled(enabled);
binding.progressBar.setEnabled(enabled);
}
disableUnsupportedButtons();
super.setEnabled(enabled);
}
@ -350,9 +312,7 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On
long duration = playerControl.getDuration();
long newPosition = (duration * progress) / 1000L;
playerControl.seekTo((int) newPosition);
if (currentTime != null) {
currentTime.setText(formatTime((int) newPosition));
}
binding.currentTimeText.setText(formatTime((int) newPosition));
}
/**

26
app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
View file

@ -58,14 +58,13 @@ import android.widget.TextView;
import android.widget.Toast;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.textfield.TextInputLayout;
import com.nextcloud.client.account.User;
import com.nextcloud.client.di.Injectable;
import com.nextcloud.client.preferences.AppPreferences;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.databinding.ReceiveExternalFilesBinding;
import com.owncloud.android.databinding.UploadFileDialogBinding;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileUploader;
import com.owncloud.android.files.services.NameCollisionPolicy;
@ -363,8 +362,8 @@ public class ReceiveExternalFilesActivity extends FileActivity
}
}
LayoutInflater layout = getLayoutInflater();
View view = layout.inflate(R.layout.upload_file_dialog, null);
LayoutInflater inflater = getLayoutInflater();
final UploadFileDialogBinding binding = UploadFileDialogBinding.inflate(inflater);
ArrayAdapter<String> adapter
= new ArrayAdapter<>(requireContext(), android.R.layout.simple_spinner_item);
@ -420,21 +419,18 @@ public class ReceiveExternalFilesActivity extends FileActivity
mFileCategory = CATEGORY_MAPS_URL;
}
final TextInputEditText userInput = view.findViewById(R.id.user_input);
final TextInputLayout userInputContainer = view.findViewById(R.id.user_input_container);
setFilename(userInput, selectPos);
userInput.requestFocus();
viewThemeUtils.material.colorTextInputLayout(userInputContainer);
setFilename(binding.userInput, selectPos);
binding.userInput.requestFocus();
viewThemeUtils.material.colorTextInputLayout(binding.userInputContainer);
final Spinner spinner = view.findViewById(R.id.file_type);
setupSpinner(adapter, selectPos, userInput, spinner);
setupSpinner(adapter, selectPos, binding.userInput, binding.fileType);
if (adapter.getCount() == SINGLE_SPINNER_ENTRY) {
view.findViewById(R.id.label_file_type).setVisibility(View.GONE);
spinner.setVisibility(View.GONE);
binding.labelFileType.setVisibility(View.GONE);
binding.fileType.setVisibility(View.GONE);
}
mSpinner = spinner;
mSpinner = binding.fileType;
Dialog filenameDialog = createFilenameDialog(view, userInput, spinner);
Dialog filenameDialog = createFilenameDialog(binding.getRoot(), binding.userInput, binding.fileType);
if (filenameDialog.getWindow() != null) {
filenameDialog.getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_STATE_VISIBLE);
}

2
app/src/main/java/com/owncloud/android/ui/adapter/UploaderAdapter.java
View file

@ -72,7 +72,7 @@ public class UploaderAdapter extends SimpleAdapter {
public View getView(int position, View convertView, ViewGroup parent) {
View vi = convertView;
if (convertView == null) {
vi = inflater.inflate(R.layout.uploader_list_item_layout, null);
vi = inflater.inflate(R.layout.uploader_list_item_layout, parent, false);
}
HashMap<String, OCFile> data = (HashMap<String, OCFile>) getItem(position);

1
app/src/main/res/layout/contacts_preference.xml
View file

@ -22,7 +22,6 @@
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:fitsSystemWindows="true">
<!-- The main content view -->

2
app/src/main/res/layout/files.xml
View file

@ -19,11 +19,9 @@
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:fitsSystemWindows="true">
<androidx.coordinatorlayout.widget.CoordinatorLayout

3
app/src/main/res/layout/preview_image_activity.xml
View file

@ -20,8 +20,7 @@
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true" >
android:layout_height="match_parent">
<com.owncloud.android.ui.components.CustomViewPager
android:id="@+id/fragmentPager"

2
scripts/analysis/lint-results.txt
View file

@ -1,2 +1,2 @@
DO NOT TOUCH; GENERATED BY DRONE
<span class="mdl-layout-title">Lint Report: 82 warnings</span>
<span class="mdl-layout-title">Lint Report: 76 warnings</span>