1
0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-09 03:37:03 +01:00

Data Management: Allow browse folders, open and share files

This commit is contained in:
José Rebelo 2024-08-20 17:18:35 +01:00
parent 09865f3943
commit 3bb969dc43
9 changed files with 339 additions and 29 deletions

View File

@ -170,6 +170,10 @@
android:name=".activities.charts.ChartsPreferencesActivity" android:name=".activities.charts.ChartsPreferencesActivity"
android:label="@string/activity_prefs_charts" android:label="@string/activity_prefs_charts"
android:parentActivityName=".activities.charts.ChartsPreferencesActivity" /> android:parentActivityName=".activities.charts.ChartsPreferencesActivity" />
<activity
android:name=".activities.files.FileManagerActivity"
android:label="@string/activity_data_management_directory_content_title"
android:parentActivityName=".activities.DataManagementActivity" />
<activity <activity
android:name=".activities.discovery.DiscoveryPairingPreferenceActivity" android:name=".activities.discovery.DiscoveryPairingPreferenceActivity"
android:label="@string/activity_prefs_discovery_pairing" android:label="@string/activity_prefs_discovery_pairing"

View File

@ -630,7 +630,7 @@ public class ActivitySummaryDetail extends AbstractGBActivity {
if (gpxTrack != null) { if (gpxTrack != null) {
try { try {
AndroidUtils.viewFile(gpxTrack, Intent.ACTION_VIEW, context); AndroidUtils.viewFile(gpxTrack, "application/gpx+xml", context);
} catch (IOException e) { } catch (IOException e) {
GB.toast(getApplicationContext(), "Unable to display GPX track: " + e.getMessage(), Toast.LENGTH_LONG, GB.ERROR, e); GB.toast(getApplicationContext(), "Unable to display GPX track: " + e.getMessage(), Toast.LENGTH_LONG, GB.ERROR, e);
} }

View File

@ -48,6 +48,7 @@ import java.util.List;
import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.activities.files.FileManagerActivity;
import nodomain.freeyourgadget.gadgetbridge.database.DBHandler; import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
import nodomain.freeyourgadget.gadgetbridge.database.DBHelper; import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
import nodomain.freeyourgadget.gadgetbridge.database.PeriodicExporter; import nodomain.freeyourgadget.gadgetbridge.database.PeriodicExporter;
@ -89,31 +90,9 @@ public class DataManagementActivity extends AbstractGBActivity {
}); });
Button showContentDataButton = findViewById(R.id.showContentDataButton); Button showContentDataButton = findViewById(R.id.showContentDataButton);
showContentDataButton.setOnClickListener(new View.OnClickListener() { showContentDataButton.setOnClickListener(v -> {
@Override final Intent fileManagerIntent = new Intent(DataManagementActivity.this, FileManagerActivity.class);
public void onClick(View v) { startActivity(fileManagerIntent);
File export_path = null;
try {
export_path = FileUtils.getExternalFilesDir();
} catch (IOException e) {
e.printStackTrace();
}
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(DataManagementActivity.this);
builder.setTitle("Export/Import directory content:");
ArrayAdapter<String> directory_listing = new ArrayAdapter<String>(DataManagementActivity.this, android.R.layout.simple_list_item_1, export_path.list());
builder.setSingleChoiceItems(directory_listing, 0, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
}
});
AlertDialog dialog = builder.create();
dialog.show();
}
}); });
int oldDBVisibility = hasOldActivityDatabase() ? View.VISIBLE : View.GONE; int oldDBVisibility = hasOldActivityDatabase() ? View.VISIBLE : View.GONE;

View File

@ -0,0 +1,89 @@
/* Copyright (C) 2024 José Rebelo
This file is part of Gadgetbridge.
Gadgetbridge is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Gadgetbridge is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. */
package nodomain.freeyourgadget.gadgetbridge.activities.files;
import android.os.Bundle;
import android.view.MenuItem;
import android.widget.Toast;
import androidx.appcompat.app.ActionBar;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.activities.AbstractGBActivity;
import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
public class FileManagerActivity extends AbstractGBActivity {
private static final Logger LOG = LoggerFactory.getLogger(FileManagerActivity.class);
public static final String EXTRA_PATH = "path";
@Override
protected void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_file_manager);
final RecyclerView fileListView = findViewById(R.id.fileListView);
fileListView.setLayoutManager(new LinearLayoutManager(this));
final File directory;
if (getIntent().hasExtra(EXTRA_PATH)) {
directory = new File(getIntent().getStringExtra(EXTRA_PATH));
} else {
try {
directory = FileUtils.getExternalFilesDir();
} catch (final IOException e) {
GB.toast("Failed to list external files dir", Toast.LENGTH_LONG, GB.ERROR);
LOG.error("Failed to list external files dir", e);
finish();
return;
}
}
if (!directory.isDirectory()) {
GB.toast("Not a directory", Toast.LENGTH_LONG, GB.ERROR);
finish();
return;
}
final ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
actionBar.setTitle(directory.getName());
}
final FileManagerAdapter appListAdapter = new FileManagerAdapter(this, directory);
fileListView.setAdapter(appListAdapter);
}
@Override
public boolean onOptionsItemSelected(final MenuItem item) {
if (item.getItemId() == android.R.id.home) {
onBackPressed();
return true;
}
return super.onOptionsItemSelected(item);
}
}

View File

@ -0,0 +1,152 @@
/* Copyright (C) 2023-2024 akasaka / Genjitsu Labs
This file is part of Gadgetbridge.
Gadgetbridge is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Gadgetbridge is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. */
package nodomain.freeyourgadget.gadgetbridge.activities.files;
import android.content.Context;
import android.content.Intent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.PopupMenu;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.recyclerview.widget.RecyclerView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.text.DecimalFormat;
import java.util.Arrays;
import java.util.List;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.util.AndroidUtils;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
public class FileManagerAdapter extends RecyclerView.Adapter<FileManagerAdapter.FileManagerViewHolder> {
protected static final Logger LOG = LoggerFactory.getLogger(FileManagerAdapter.class);
private final List<File> fileList;
private final Context mContext;
public FileManagerAdapter(final Context context, final File directory) {
mContext = context;
// FIXME: This can be slow, make it async
fileList = Arrays.asList(directory.listFiles());
fileList.sort((f1, f2) -> {
if (f1.isDirectory() && f2.isFile())
return -1;
if (f1.isFile() && f2.isDirectory())
return 1;
return String.CASE_INSENSITIVE_ORDER.compare(f1.getName(), f2.getName());
});
}
@NonNull
@Override
public FileManagerViewHolder onCreateViewHolder(@NonNull final ViewGroup parent, final int viewType) {
final View view = LayoutInflater.from(mContext).inflate(R.layout.item_file_manager, parent, false);
return new FileManagerViewHolder(view);
}
@Override
public void onBindViewHolder(final FileManagerViewHolder holder, int position) {
final File file = fileList.get(position);
holder.name.setText(file.getName());
if (file.isDirectory()) {
holder.icon.setImageDrawable(AppCompatResources.getDrawable(mContext, R.drawable.ic_folder));
holder.description.setVisibility(View.GONE);
holder.menu.setVisibility(View.GONE);
} else {
holder.icon.setImageDrawable(AppCompatResources.getDrawable(mContext, R.drawable.ic_file_open));
holder.description.setText(formatFileSize(file.length()));
holder.description.setVisibility(View.VISIBLE);
holder.menu.setVisibility(View.VISIBLE);
holder.menu.setOnClickListener(view -> {
final PopupMenu menu = new PopupMenu(mContext, holder.menu);
menu.inflate(R.menu.file_manager_file);
menu.setOnMenuItemClickListener(item -> {
final int itemId = item.getItemId();
if (itemId == R.id.file_manager_file_menu_share) {
try {
AndroidUtils.shareFile(mContext, file, "*/*");
} catch (final IOException e) {
GB.toast("Failed to share file", Toast.LENGTH_LONG, GB.ERROR, e);
}
return true;
}
return false;
});
menu.show();
});
}
holder.itemView.setOnClickListener(v -> {
if (file.isDirectory()) {
final Intent fileManagerIntent = new Intent(mContext, FileManagerActivity.class);
fileManagerIntent.putExtra(FileManagerActivity.EXTRA_PATH, file.getPath());
mContext.startActivity(fileManagerIntent);
} else {
try {
AndroidUtils.viewFile(file.getAbsolutePath(), "*/*", mContext);
} catch (final IOException e) {
GB.toast("Failed to open file", Toast.LENGTH_LONG, GB.ERROR, e);
}
}
});
}
@Override
public int getItemCount() {
return fileList.size();
}
public static class FileManagerViewHolder extends RecyclerView.ViewHolder {
final ImageView icon;
final TextView name;
final TextView description;
final ImageView menu;
FileManagerViewHolder(View itemView) {
super(itemView);
icon = itemView.findViewById(R.id.file_icon);
name = itemView.findViewById(R.id.file_name);
description = itemView.findViewById(R.id.file_description);
menu = itemView.findViewById(R.id.file_menu);
}
}
private static final DecimalFormat SIZE_FORMAT = new DecimalFormat("#,##0.#");
public static String formatFileSize(final long size) {
if (size <= 0) return "0";
final String[] units = new String[]{"B", "kB", "MB", "GB", "TB", "PB", "EB"};
int digitGroups = (int) (Math.log10(size) / Math.log10(1024));
return SIZE_FORMAT.format(size / Math.pow(1024, digitGroups)) + " " + units[digitGroups];
}
}

View File

@ -265,14 +265,14 @@ public class AndroidUtils {
throw new IllegalArgumentException("Unable to decode the given uri to a file path: " + uri); throw new IllegalArgumentException("Unable to decode the given uri to a file path: " + uri);
} }
public static void viewFile(String path, String action, Context context) throws IOException { public static void viewFile(String path, String mimeType, Context context) throws IOException {
Intent intent = new Intent(action); Intent intent = new Intent(Intent.ACTION_VIEW);
File file = new File(path); File file = new File(path);
Uri contentUri = FileProvider.getUriForFile(context, Uri contentUri = FileProvider.getUriForFile(context,
context.getApplicationContext().getPackageName() + ".screenshot_provider", file); context.getApplicationContext().getPackageName() + ".screenshot_provider", file);
intent.setFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION); intent.setFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION);
intent.setDataAndType(contentUri,"application/gpx+xml"); intent.setDataAndType(contentUri, mimeType);
try { try {
context.startActivity(intent); context.startActivity(intent);
} catch (ActivityNotFoundException e) { } catch (ActivityNotFoundException e) {

View File

@ -0,0 +1,16 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activities.files.FileManagerActivity">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/fileListView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:divider="@null"
android:scrollbarSize="5dp"
android:scrollbars="vertical" />
</RelativeLayout>

View File

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout 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:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:minHeight="60dp">
<ImageView
android:id="@+id/file_icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:paddingTop="8dp"
android:paddingBottom="8dp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toStartOf="@+id/file_menu"
android:layout_toEndOf="@+id/file_icon"
android:orientation="vertical"
android:padding="8dp">
<TextView
android:id="@+id/file_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollHorizontally="false"
android:text="-"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/file_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:text=""
android:textAppearance="@style/TextAppearance.AppCompat.Small" />
</LinearLayout>
<ImageView
android:id="@+id/file_menu"
android:layout_width="32dp"
android:layout_height="48dp"
android:layout_alignParentEnd="true"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
app:srcCompat="@drawable/ic_more_vert" />
</RelativeLayout>

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/file_manager_file_menu_share"
android:title="@string/share" />
</menu>