diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b52e5ac5..e3dd3772 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -97,8 +97,7 @@ + android:theme="@style/AppTheme.Transparent"/> diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/common/ScriptOperations.java b/app/src/main/java/com/stardust/scriptdroid/ui/common/ScriptOperations.java index 8de68229..444ad65e 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/common/ScriptOperations.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/common/ScriptOperations.java @@ -43,6 +43,7 @@ import java.io.InputStream; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.functions.Consumer; import io.reactivex.schedulers.Schedulers; import io.reactivex.subjects.PublishSubject; @@ -118,9 +119,10 @@ public class ScriptOperations { } else { showMessage(R.string.text_import_fail); } - mStorageFileProvider.notifyFileCreated(mCurrentDirectory, new ScriptFile(pathTo)); return pathTo; - }); + }) + .observeOn(AndroidSchedulers.mainThread()) + .doOnNext(path -> mStorageFileProvider.notifyFileCreated(mCurrentDirectory, new ScriptFile(path))); } public Observable importFile(String prefix, final InputStream inputStream, final String ext) { @@ -305,7 +307,7 @@ public class ScriptOperations { new FileChooserDialogBuilder(mContext) .dir(Environment.getExternalStorageDirectory().getPath()) .justScriptFile() - .singleChoice(file -> importFile(file.getPath())) + .singleChoice(file -> importFile(file.getPath()).subscribe()) .title(R.string.text_select_file_to_import) .positiveText(R.string.ok) .show(); diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/FloatingActionMenu.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/FloatingActionMenu.java index 02b52417..530bac41 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/main/FloatingActionMenu.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/FloatingActionMenu.java @@ -41,7 +41,7 @@ public class FloatingActionMenu extends FrameLayout implements View.OnClickListe private View[] mFabContainers; private boolean mExpanded = false; private int mInterval = 30; - private int mDuration = 300; + private int mDuration = 250; private final Interpolator mInterpolator = new FastOutSlowInInterpolator(); private final PublishSubject mState = PublishSubject.create(); private OnFloatingActionButtonClickListener mOnFloatingActionButtonClickListener;