From 4e6e8c68f8edf8c0465fa509c5e94d555458137e Mon Sep 17 00:00:00 2001 From: Kosh Date: Sun, 15 Jan 2017 10:58:12 +0800 Subject: [PATCH] released version 10.0.5 --- app/build.gradle | 6 +++--- .../java/com/fastaccess/helper/NotificationHelper.java | 2 +- .../main/java/com/fastaccess/helper/PrefConstant.java | 5 +++++ .../fastaccess/provider/service/FloatingService.java | 10 ++++++---- .../ui/modules/floating/BaseFloatingView.java | 3 ++- .../ui/modules/floating/apps/FloatingVHPresenter.java | 6 ++++-- .../floating/folders/drawer/FloatingDrawPresenter.java | 6 ++++-- .../java/com/fastaccess/ui/modules/main/MainView.java | 2 +- .../layouts/main_layouts/layout/whats_new_layout.xml | 6 +++--- app/src/main/res/values/strings.xml | 8 ++------ app/src/main/res/xml/fa_settings.xml | 6 ++++++ 11 files changed, 37 insertions(+), 23 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c0a1bc6..f601484 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,13 +10,13 @@ android { } } compileSdkVersion 25 - buildToolsVersion "25.0.0" + buildToolsVersion "25.0.2" defaultConfig { applicationId "com.styleme.floating.toolbox.pro" minSdkVersion 18 targetSdkVersion 25 - versionCode 104 - versionName "10.0.4" + versionCode 105 + versionName "10.0.5" buildConfigField "String", "FA_HOST", '"k0shk0sh.github.io/FastAccess"' buildConfigField "String", "SHARED_URI", '"sharedUri"' signingConfig signingConfigs.signing diff --git a/app/src/main/java/com/fastaccess/helper/NotificationHelper.java b/app/src/main/java/com/fastaccess/helper/NotificationHelper.java index 190d281..5c7241b 100755 --- a/app/src/main/java/com/fastaccess/helper/NotificationHelper.java +++ b/app/src/main/java/com/fastaccess/helper/NotificationHelper.java @@ -114,7 +114,7 @@ public static void collapseFAService(Context context, int size) { context.stopService(new Intent(context, FloatingService.class)); Intent notificationIntent = new Intent(context, FloatingService.class); notificationIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - PendingIntent pendingIntent = PendingIntent.getService(context, 0, notificationIntent, 0); + PendingIntent pendingIntent = PendingIntent.getService(context, 0, notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT); NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(context); int icon = R.drawable.ic_fa_notification; long finalTime = System.currentTimeMillis(); diff --git a/app/src/main/java/com/fastaccess/helper/PrefConstant.java b/app/src/main/java/com/fastaccess/helper/PrefConstant.java index 7601811..7a7d580 100644 --- a/app/src/main/java/com/fastaccess/helper/PrefConstant.java +++ b/app/src/main/java/com/fastaccess/helper/PrefConstant.java @@ -34,6 +34,7 @@ public class PrefConstant { public static final String FA_IS_HORIZONTAL = "fa_is_horizontal"; public static final String WHATS_NEW_VERSION = "whats_new_version"; public static final String INTRO_SCREEN = "intro_screen"; + public static final String STOP_FLAG = "stop_flag"; public static void savePosition(int x, int y) { boolean isAutoSavePosition = PrefHelper.getBoolean(PrefConstant.FA_AUTO_SAVE_POSITION); @@ -104,4 +105,8 @@ public static boolean showIntroScreen() { public static void setIntroScreen() { PrefHelper.set(INTRO_SCREEN, true); } + + public static boolean isLongPressEnabled() { + return PrefHelper.getBoolean("fa_long_press"); + } } diff --git a/app/src/main/java/com/fastaccess/provider/service/FloatingService.java b/app/src/main/java/com/fastaccess/provider/service/FloatingService.java index 126fa22..a30411b 100644 --- a/app/src/main/java/com/fastaccess/provider/service/FloatingService.java +++ b/app/src/main/java/com/fastaccess/provider/service/FloatingService.java @@ -9,6 +9,7 @@ import android.support.annotation.Nullable; import com.fastaccess.R; +import com.fastaccess.helper.Bundler; import com.fastaccess.helper.InputHelper; import com.fastaccess.helper.NotificationHelper; import com.fastaccess.helper.PrefConstant; @@ -17,6 +18,8 @@ import com.fastaccess.ui.modules.floating.folders.FloatingFoldersView; import com.fastaccess.ui.modules.main.MainView; +import static com.fastaccess.helper.PrefConstant.STOP_FLAG; + /** * Created by Kosh on 13 Oct 2016, 7:32 PM */ @@ -24,7 +27,6 @@ public class FloatingService extends Service { private FloatingVHView floatingVHView; private FloatingFoldersView floatingFoldersView; - public static final String STOP_FLAG = "stop_flag"; @Override public void onCreate() { super.onCreate(); @@ -42,7 +44,7 @@ public class FloatingService extends Service { floatingVHView = FloatingVHView.with(this, PrefConstant.isHorizontal()); } Intent stopServiceIntent = new Intent(this, FloatingService.class); - stopServiceIntent.putExtra(STOP_FLAG, true); + stopServiceIntent.putExtras(Bundler.start().put(STOP_FLAG, true).end()); startForeground(NotificationHelper.NOTIFICATION_ID, NotificationHelper.getNonCancellableNotification(this, getString(R.string.app_name), getString(R.string.click_to_open_fa), PrefHelper.getBoolean(PrefConstant.STATUS_BAR_HIDDEN) ? R.drawable.ic_notification : R.drawable.ic_fa_notification, @@ -56,9 +58,9 @@ public class FloatingService extends Service { @Override public int onStartCommand(Intent intent, int flags, int startId) { super.onStartCommand(intent, flags, startId); - if (intent != null && intent.getBooleanExtra(STOP_FLAG, false)) { + if (intent != null && intent.getExtras() != null && intent.getExtras().getBoolean(PrefConstant.STOP_FLAG)) { + NotificationHelper.collapseFAService(this, 0); stopForeground(true); - stopSelf(); } return START_STICKY; } diff --git a/app/src/main/java/com/fastaccess/ui/modules/floating/BaseFloatingView.java b/app/src/main/java/com/fastaccess/ui/modules/floating/BaseFloatingView.java index 26d04ae..5c7a37c 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/floating/BaseFloatingView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/floating/BaseFloatingView.java @@ -16,6 +16,7 @@ import com.fastaccess.data.dao.FolderModel; import com.fastaccess.data.dao.events.FloatingEventModel; import com.fastaccess.data.dao.events.ThemePackEventModel; +import com.fastaccess.helper.NotificationHelper; import com.fastaccess.helper.PermissionsHelper; import com.fastaccess.helper.PrefConstant; import com.fastaccess.helper.PrefHelper; @@ -103,7 +104,7 @@ public abstract class BaseFloatingView implements BaseFloatingMvp.BaseView } @Override public void onLongPressed() { -// NotificationHelper.collapseFAService(context, getAdapter().getItemCount()); + if (PrefConstant.isLongPressEnabled()) NotificationHelper.collapseFAService(context, getAdapter().getItemCount()); } @Override public void onDoubleTapped() { diff --git a/app/src/main/java/com/fastaccess/ui/modules/floating/apps/FloatingVHPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/floating/apps/FloatingVHPresenter.java index 723f39e..7f582d0 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/floating/apps/FloatingVHPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/floating/apps/FloatingVHPresenter.java @@ -3,6 +3,7 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.support.annotation.NonNull; import android.view.View; @@ -28,9 +29,10 @@ public static FloatingVHPresenter with(@NonNull BaseFloatingMvp.BaseView implemen PrefConstant.setIntroScreen(); } if (PrefConstant.showWhatsNew()) { - startActivity(new Intent(this, WhatsNewView.class)); PrefConstant.setWhatsNewVersion(); + startActivity(new Intent(this, WhatsNewView.class)); } } diff --git a/app/src/main/res/layouts/main_layouts/layout/whats_new_layout.xml b/app/src/main/res/layouts/main_layouts/layout/whats_new_layout.xml index 7ab81e9..6a6ec35 100644 --- a/app/src/main/res/layouts/main_layouts/layout/whats_new_layout.xml +++ b/app/src/main/res/layouts/main_layouts/layout/whats_new_layout.xml @@ -97,7 +97,7 @@ android:layout_marginStart="@dimen/spacing_xs_large" android:layout_marginTop="@dimen/spacing_xs_large" android:background="@drawable/bottom_border" - android:text="Version 10.0.4" + android:text="Version 10.0.5" android:textColor="@color/primary_light"/> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b877965..efcd684 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -135,12 +135,6 @@ What\'s New Version: Rate Fast Access - (New) Revamping of FA from the ground to make it more faster and efficient. - - - (NEW) Folders mode, now you can categorize your apps under folders. - - FA is an open source app, you can check the source code from the settings screen. Auto Save Last Position Selecting Apps Actions Upon selecting apps, you get two options:\nSelect All & Add All @@ -155,4 +149,6 @@ There is a folder exists with the name you entered, please use different name to create new folder. FA Floating Modes FA has two Floating Modes\n Apps & Folders.\n By default Apps is selected. + Enable long press on FA icon to hide it. + FA Long Press. diff --git a/app/src/main/res/xml/fa_settings.xml b/app/src/main/res/xml/fa_settings.xml index 69c9fa6..72931ca 100644 --- a/app/src/main/res/xml/fa_settings.xml +++ b/app/src/main/res/xml/fa_settings.xml @@ -26,6 +26,12 @@ android:summary="@string/auto_start_summary" android:title="@string/auto_start_title"/> + +