diff --git a/app/build.gradle b/app/build.gradle
index a693eb8cef..49be6504a2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -267,6 +267,7 @@ kotlin {
configurations.configureEach {
resolutionStrategy {
+ force 'androidx.core:core:1.7.0'
dependencySubstitution {
substitute module("commons-logging:commons-logging-api:1.1") using module("commons-logging:commons-logging:1.1.1")
substitute module("com.android.support:support-annotations:27.1.1") using module("com.android.support:support-annotations:27.0.2")
diff --git a/app/src/androidTest/AndroidManifest.xml b/app/src/androidTest/AndroidManifest.xml
new file mode 100644
index 0000000000..5e61450158
--- /dev/null
+++ b/app/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 503c5fce63..560ff34e7f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,6 +22,8 @@
+
+
@@ -52,13 +54,10 @@
+ android:banner="@drawable/about_header">
-
+ android:label="Extracting" />
+ android:label="Compressing" />
+ android:label="Copying" />
+ android:label="@string/crypt_encrypting" />
+ android:label="@string/crypt_decrypting" />
-
-
-
-
-
, Vishal Nehra ,
- * Emmanuel Messulam, Raymond Lai and Contributors.
- *
- * This file is part of Amaze File Manager.
- *
- * Amaze File Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package com.amaze.filemanager.asynchronous.services.ftp;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import com.amaze.filemanager.R;
-import com.amaze.filemanager.utils.NetworkUtil;
-
-import android.annotation.TargetApi;
-import android.content.Intent;
-import android.graphics.drawable.Icon;
-import android.os.Build;
-import android.service.quicksettings.Tile;
-import android.service.quicksettings.TileService;
-import android.widget.Toast;
-
-/** Created by vishal on 1/1/17. */
-@TargetApi(Build.VERSION_CODES.N)
-public class FtpTileService extends TileService {
-
- @Subscribe
- public void onFtpReceiverActions(FtpService.FtpReceiverActions signal) {
- updateTileState();
- }
-
- @Override
- public void onStartListening() {
- super.onStartListening();
- EventBus.getDefault().register(this);
- updateTileState();
- }
-
- @Override
- public void onStopListening() {
- super.onStopListening();
- EventBus.getDefault().unregister(this);
- }
-
- @Override
- public void onClick() {
- unlockAndRun(
- () -> {
- if (FtpService.isRunning()) {
- getApplicationContext()
- .sendBroadcast(
- new Intent(FtpService.ACTION_STOP_FTPSERVER).setPackage(getPackageName()));
- } else {
- if (NetworkUtil.isConnectedToWifi(getApplicationContext())
- || NetworkUtil.isConnectedToLocalNetwork(getApplicationContext())) {
- Intent i = new Intent(FtpService.ACTION_START_FTPSERVER).setPackage(getPackageName());
- i.putExtra(FtpService.TAG_STARTED_BY_TILE, true);
- getApplicationContext().sendBroadcast(i);
- } else {
- Toast.makeText(
- getApplicationContext(), getString(R.string.ftp_no_wifi), Toast.LENGTH_LONG)
- .show();
- }
- }
- });
- }
-
- private void updateTileState() {
- Tile tile = getQsTile();
- if (FtpService.isRunning()) {
- tile.setState(Tile.STATE_ACTIVE);
- tile.setIcon(Icon.createWithResource(this, R.drawable.ic_ftp_dark));
- } else {
- tile.setState(Tile.STATE_INACTIVE);
- tile.setIcon(Icon.createWithResource(this, R.drawable.ic_ftp_light));
- }
- tile.updateTile();
- }
-}
diff --git a/app/src/main/java/com/amaze/filemanager/ui/activities/MainActivity.java b/app/src/main/java/com/amaze/filemanager/ui/activities/MainActivity.java
index 2e835df77c..d4cfacb667 100644
--- a/app/src/main/java/com/amaze/filemanager/ui/activities/MainActivity.java
+++ b/app/src/main/java/com/amaze/filemanager/ui/activities/MainActivity.java
@@ -181,7 +181,6 @@
import android.os.Handler;
import android.os.storage.StorageManager;
import android.os.storage.StorageVolume;
-import android.service.quicksettings.TileService;
import android.text.TextUtils;
import android.view.KeyEvent;
import android.view.Menu;
@@ -468,7 +467,7 @@ public void invalidateFragmentAndBundle(Bundle savedInstanceState, boolean isClo
transaction.commit();
supportInvalidateOptionsMenu();
} else if (intent.getAction() != null
- && (intent.getAction().equals(TileService.ACTION_QS_TILE_PREFERENCES)
+ && ((SDK_INT >= N && intent.getAction().equals("android.service.quicksettings.action.QS_TILE_PREFERENCES"))
|| INTENT_ACTION_OPEN_FTP_SERVER.equals(intent.getAction()))) {
// tile preferences, open ftp fragment
diff --git a/app/src/main/res/layout-small/griditem.xml b/app/src/main/res/layout-small/griditem.xml
new file mode 100644
index 0000000000..54d7259cc6
--- /dev/null
+++ b/app/src/main/res/layout-small/griditem.xml
@@ -0,0 +1,176 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout-small/rowlayout.xml b/app/src/main/res/layout-small/rowlayout.xml
new file mode 100644
index 0000000000..62a8f738c4
--- /dev/null
+++ b/app/src/main/res/layout-small/rowlayout.xml
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_preferences.xml b/app/src/main/res/layout/activity_preferences.xml
index 32c30756a1..a5ecbfee7a 100644
--- a/app/src/main/res/layout/activity_preferences.xml
+++ b/app/src/main/res/layout/activity_preferences.xml
@@ -31,7 +31,6 @@
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:minHeight="?attr/actionBarSize"
- android:elevation="10dp"
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
/>
diff --git a/app/src/main/res/layout/fragment_open_file_dialog.xml b/app/src/main/res/layout/fragment_open_file_dialog.xml
index 2364e7b218..8392256d2a 100644
--- a/app/src/main/res/layout/fragment_open_file_dialog.xml
+++ b/app/src/main/res/layout/fragment_open_file_dialog.xml
@@ -7,7 +7,6 @@
android:layout_height="wrap_content"
android:maxHeight="@dimen/material_sheet_height"
android:background="@drawable/shape_dialog_bottomsheet_white"
- android:elevation="@dimen/material_generic_card_elevation"
>
+ android:orientation="vertical">