mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2026-04-17 12:21:22 +00:00
Code Issues Releases Wiki Activity

Improve code style to be more consistent

Browse Source
This commit is contained in:
wb9688
2020-03-31 19:20:15 +02:00
parent 819e52cab3
commit fda5405e48
244 changed files with 10116 additions and 7222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
app/src/main/java/org/schabi/newpipe/util/FilePickerActivityHelper.java
View File

@@ -5,11 +5,6 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.os.Environment;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.loader.content.Loader;
import androidx.recyclerview.widget.SortedList;
import androidx.recyclerview.widget.RecyclerView;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
@@ -17,6 +12,12 @@ import android.view.ViewGroup;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.loader.content.Loader;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.SortedList;
import com.nononsenseapps.filepicker.AbstractFilePickerFragment;
import com.nononsenseapps.filepicker.FilePickerFragment;
@@ -25,11 +26,36 @@ import org.schabi.newpipe.R;
import java.io.File;
public class FilePickerActivityHelper extends com.nononsenseapps.filepicker.FilePickerActivity {
private CustomFilePickerFragment currentFragment;
public static Intent chooseSingleFile(@NonNull final Context context) {
return new Intent(context, FilePickerActivityHelper.class)
.putExtra(FilePickerActivityHelper.EXTRA_ALLOW_MULTIPLE, false)
.putExtra(FilePickerActivityHelper.EXTRA_ALLOW_CREATE_DIR, false)
.putExtra(FilePickerActivityHelper.EXTRA_SINGLE_CLICK, true)
.putExtra(FilePickerActivityHelper.EXTRA_MODE, FilePickerActivityHelper.MODE_FILE);
}
public static Intent chooseFileToSave(@NonNull final Context context,
@Nullable final String startPath) {
return new Intent(context, FilePickerActivityHelper.class)
.putExtra(FilePickerActivityHelper.EXTRA_ALLOW_MULTIPLE, false)
.putExtra(FilePickerActivityHelper.EXTRA_ALLOW_CREATE_DIR, true)
.putExtra(FilePickerActivityHelper.EXTRA_ALLOW_EXISTING_FILE, true)
.putExtra(FilePickerActivityHelper.EXTRA_START_PATH, startPath)
.putExtra(FilePickerActivityHelper.EXTRA_MODE,
FilePickerActivityHelper.MODE_NEW_FILE);
}
public static boolean isOwnFileUri(@NonNull final Context context, @NonNull final Uri uri) {
if (uri.getAuthority() == null) {
return false;
}
return uri.getAuthority().startsWith(context.getPackageName());
}
@Override
public void onCreate(Bundle savedInstanceState) {
public void onCreate(final Bundle savedInstanceState) {
if (ThemeHelper.isLightThemeSelected(this)) {
this.setTheme(R.style.FilePickerThemeLight);
} else {
@@ -50,33 +76,18 @@ public class FilePickerActivityHelper extends com.nononsenseapps.filepicker.File
}
@Override
protected AbstractFilePickerFragment<File> getFragment(@Nullable String startPath, int mode, boolean allowMultiple, boolean allowCreateDir, boolean allowExistingFile, boolean singleClick) {
protected AbstractFilePickerFragment<File> getFragment(@Nullable final String startPath,
final int mode,
final boolean allowMultiple,
final boolean allowCreateDir,
final boolean allowExistingFile,
final boolean singleClick) {
final CustomFilePickerFragment fragment = new CustomFilePickerFragment();
fragment.setArgs(startPath != null ? startPath : Environment.getExternalStorageDirectory().getPath(),
fragment.setArgs(startPath != null ? startPath
: Environment.getExternalStorageDirectory().getPath(),
mode, allowMultiple, allowCreateDir, allowExistingFile, singleClick);
return currentFragment = fragment;
}
public static Intent chooseSingleFile(@NonNull Context context) {
return new Intent(context, FilePickerActivityHelper.class)
.putExtra(FilePickerActivityHelper.EXTRA_ALLOW_MULTIPLE, false)
.putExtra(FilePickerActivityHelper.EXTRA_ALLOW_CREATE_DIR, false)
.putExtra(FilePickerActivityHelper.EXTRA_SINGLE_CLICK, true)
.putExtra(FilePickerActivityHelper.EXTRA_MODE, FilePickerActivityHelper.MODE_FILE);
}
public static Intent chooseFileToSave(@NonNull Context context, @Nullable String startPath) {
return new Intent(context, FilePickerActivityHelper.class)
.putExtra(FilePickerActivityHelper.EXTRA_ALLOW_MULTIPLE, false)
.putExtra(FilePickerActivityHelper.EXTRA_ALLOW_CREATE_DIR, true)
.putExtra(FilePickerActivityHelper.EXTRA_ALLOW_EXISTING_FILE, true)
.putExtra(FilePickerActivityHelper.EXTRA_START_PATH, startPath)
.putExtra(FilePickerActivityHelper.EXTRA_MODE, FilePickerActivityHelper.MODE_NEW_FILE);
}
public static boolean isOwnFileUri(@NonNull Context context, @NonNull Uri uri) {
if (uri.getAuthority() == null) return false;
return uri.getAuthority().startsWith(context.getPackageName());
currentFragment = fragment;
return currentFragment;
}
/*//////////////////////////////////////////////////////////////////////////
@@ -84,30 +95,35 @@ public class FilePickerActivityHelper extends com.nononsenseapps.filepicker.File
//////////////////////////////////////////////////////////////////////////*/
public static class CustomFilePickerFragment extends FilePickerFragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
public View onCreateView(final LayoutInflater inflater, final ViewGroup container,
final Bundle savedInstanceState) {
return super.onCreateView(inflater, container, savedInstanceState);
}
@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull final ViewGroup parent,
final int viewType) {
final RecyclerView.ViewHolder viewHolder = super.onCreateViewHolder(parent, viewType);
final View view = viewHolder.itemView.findViewById(android.R.id.text1);
if (view instanceof TextView) {
((TextView) view).setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.file_picker_items_text_size));
((TextView) view).setTextSize(TypedValue.COMPLEX_UNIT_PX,
getResources().getDimension(R.dimen.file_picker_items_text_size));
}
return viewHolder;
}
@Override
public void onClickOk(@NonNull View view) {
public void onClickOk(@NonNull final View view) {
if (mode == MODE_NEW_FILE && getNewFileName().isEmpty()) {
if (mToast != null) mToast.cancel();
mToast = Toast.makeText(getActivity(), R.string.file_name_empty_error, Toast.LENGTH_SHORT);
if (mToast != null) {
mToast.cancel();
}
mToast = Toast.makeText(getActivity(), R.string.file_name_empty_error,
Toast.LENGTH_SHORT);
mToast.show();
return;
}
@@ -116,13 +132,17 @@ public class FilePickerActivityHelper extends com.nononsenseapps.filepicker.File
}
@Override
protected boolean isItemVisible(@NonNull File file) {
if (file.isDirectory() && file.isHidden()) return true;
protected boolean isItemVisible(@NonNull final File file) {
if (file.isDirectory() && file.isHidden()) {
return true;
}
return super.isItemVisible(file);
}
public File getBackTop() {
if (getArguments() == null) return Environment.getExternalStorageDirectory();
if (getArguments() == null) {
return Environment.getExternalStorageDirectory();
}
final String path = getArguments().getString(KEY_START_PATH, "/");
if (path.contains(Environment.getExternalStorageDirectory().getPath())) {
@@ -133,11 +153,13 @@ public class FilePickerActivityHelper extends com.nononsenseapps.filepicker.File
}
public boolean isBackTop() {
return compareFiles(mCurrentPath, getBackTop()) == 0 || compareFiles(mCurrentPath, new File("/")) == 0;
return compareFiles(mCurrentPath,
getBackTop()) == 0 || compareFiles(mCurrentPath, new File("/")) == 0;
}
@Override
public void onLoadFinished(Loader<SortedList<File>> loader, SortedList<File> data) {
public void onLoadFinished(final Loader<SortedList<File>> loader,
final SortedList<File> data) {
super.onLoadFinished(loader, data);
layoutManager.scrollToPosition(0);
}