From aff39c356152bcb4207ae6a40fd6db10c62e4597 Mon Sep 17 00:00:00 2001 From: Kosh Date: Wed, 28 Dec 2016 19:42:10 +0800 Subject: [PATCH] releasing version 10.0.4 fixing restore, stopping fa from service instead of long press and opening app base on component name. --- app/build.gradle | 8 +- .../fastaccess/helper/NotificationHelper.java | 9 +- .../provider/service/FloatingService.java | 16 +- .../cloud/restore/RestorePresenter.java | 13 +- .../ui/modules/cloud/restore/RestoreView.java | 3 +- .../ui/modules/floating/BaseFloatingView.java | 3 +- .../floating/apps/FloatingVHPresenter.java | 8 +- .../folders/drawer/FloatingDrawPresenter.java | 8 +- .../main_layouts/layout/whats_new_layout.xml | 231 +----------------- app/src/main/res/values/strings.xml | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 12 files changed, 44 insertions(+), 263 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d4eafd7..c0a1bc6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId "com.styleme.floating.toolbox.pro" minSdkVersion 18 targetSdkVersion 25 - versionCode 103 - versionName "10.0.3" + versionCode 104 + versionName "10.0.4" buildConfigField "String", "FA_HOST", '"k0shk0sh.github.io/FastAccess"' buildConfigField "String", "SHARED_URI", '"sharedUri"' signingConfig signingConfigs.signing @@ -55,8 +55,8 @@ repositories { } dependencies { ext { - supportVerion = "25.0.1" - firebase = "10.0.0" + supportVerion = "25.1.0" + firebase = "10.0.1" } compile fileTree(include: ['*.jar'], dir: 'libs') compile "com.android.support:appcompat-v7:${supportVerion}" diff --git a/app/src/main/java/com/fastaccess/helper/NotificationHelper.java b/app/src/main/java/com/fastaccess/helper/NotificationHelper.java index 7be6b62..190d281 100755 --- a/app/src/main/java/com/fastaccess/helper/NotificationHelper.java +++ b/app/src/main/java/com/fastaccess/helper/NotificationHelper.java @@ -95,14 +95,17 @@ public static void notifyWithImage(@NonNull Context context, @NonNull String tit notificationManager.notify(NOTIFICATION_ID, notification); } - public static Notification getNonCancellableNotification(@NonNull Context content, @NonNull String title, @NonNull String msg, - @DrawableRes int iconId, @NonNull PendingIntent pendingIntent) { - return new NotificationCompat.Builder(content) + public static Notification getNonCancellableNotification(@NonNull Context context, @NonNull String title, @NonNull String msg, + @DrawableRes int iconId, @NonNull PendingIntent pendingIntent, + @NonNull PendingIntent stopServiceIntent) { + return new NotificationCompat.Builder(context) .setAutoCancel(false) .setOngoing(true) .setContentTitle(title) .setContentText(msg) .setSmallIcon(iconId) + .addAction(R.drawable.ic_stop, context.getString(R.string.stop_service), stopServiceIntent) + .addAction(R.drawable.ic_fa_notification, context.getString(R.string.click_to_open_fa), pendingIntent) .setContentIntent(pendingIntent) .build(); } 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 a046f7a..126fa22 100644 --- a/app/src/main/java/com/fastaccess/provider/service/FloatingService.java +++ b/app/src/main/java/com/fastaccess/provider/service/FloatingService.java @@ -24,6 +24,7 @@ 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(); @@ -40,10 +41,13 @@ public class FloatingService extends Service { } else { floatingVHView = FloatingVHView.with(this, PrefConstant.isHorizontal()); } - 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, - PendingIntent.getActivity(this, 0, new Intent(this, MainView.class), PendingIntent.FLAG_UPDATE_CURRENT))); + Intent stopServiceIntent = new Intent(this, FloatingService.class); + stopServiceIntent.putExtra(STOP_FLAG, true); + 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, + PendingIntent.getActivity(this, 0, new Intent(this, MainView.class), PendingIntent.FLAG_UPDATE_CURRENT), + PendingIntent.getService(this, 0, stopServiceIntent, PendingIntent.FLAG_UPDATE_CURRENT))); } @Nullable @Override public IBinder onBind(Intent intent) { @@ -52,6 +56,10 @@ 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)) { + stopForeground(true); + stopSelf(); + } return START_STICKY; } diff --git a/app/src/main/java/com/fastaccess/ui/modules/cloud/restore/RestorePresenter.java b/app/src/main/java/com/fastaccess/ui/modules/cloud/restore/RestorePresenter.java index 09cea41..6f5ee31 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/cloud/restore/RestorePresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/cloud/restore/RestorePresenter.java @@ -8,7 +8,6 @@ import com.fastaccess.helper.InputHelper; import com.fastaccess.helper.Logger; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.cloud.backup.BackupView; import com.google.firebase.auth.FirebaseUser; import com.google.firebase.database.DataSnapshot; import com.google.firebase.database.DatabaseError; @@ -42,9 +41,7 @@ public static RestorePresenter with(@NonNull RestoreMvp.View view) { } else { getView().onShowProgress(); Query query = databaseReference - .child(BackupView.BACKUP_DATABASE_NAME) - .child(userId) - .limitToFirst(1); + .child(userId); query.keepSynced(true); query.addListenerForSingleValueEvent(this); } @@ -52,8 +49,7 @@ public static RestorePresenter with(@NonNull RestoreMvp.View view) { @Override public void onDataChange(DataSnapshot dataSnapshot) { if (!isAttached()) return; - if (dataSnapshot != null) { - Logger.e(dataSnapshot); + if (dataSnapshot != null && dataSnapshot.hasChildren()) { FirebaseUser user = getView().user(); if (InputHelper.isEmpty(userId)) { if (user != null) userId = user.getUid(); @@ -64,9 +60,8 @@ public static RestorePresenter with(@NonNull RestoreMvp.View view) { getView().finishOnError(); return; } - if (dataSnapshot.hasChildren()) { - BackupRestoreModel.restore(dataSnapshot.getValue(BackupRestoreModel.class)); - } + Logger.e(dataSnapshot); + BackupRestoreModel.restore(dataSnapshot.getValue(BackupRestoreModel.class)); getView().onHideProgress(); getView().onRestoreCompleted(); } else { diff --git a/app/src/main/java/com/fastaccess/ui/modules/cloud/restore/RestoreView.java b/app/src/main/java/com/fastaccess/ui/modules/cloud/restore/RestoreView.java index 5bd05c8..0982854 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/cloud/restore/RestoreView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/cloud/restore/RestoreView.java @@ -10,6 +10,7 @@ import com.fastaccess.R; import com.fastaccess.helper.InputHelper; import com.fastaccess.ui.base.BaseActivity; +import com.fastaccess.ui.modules.cloud.backup.BackupView; import com.fastaccess.ui.widgets.dialog.MessageDialogView; import com.google.firebase.auth.FirebaseAuth; import com.google.firebase.auth.FirebaseUser; @@ -129,7 +130,7 @@ private ProgressDialog getProgressDialog() { private DatabaseReference getDatabase() { if (database == null) { - database = FirebaseDatabase.getInstance().getReference(); + database = FirebaseDatabase.getInstance().getReference(BackupView.BACKUP_DATABASE_NAME); } return database; } 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 92cf33e..26d04ae 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,7 +16,6 @@ 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; @@ -104,7 +103,7 @@ public abstract class BaseFloatingView implements BaseFloatingMvp.BaseView } @Override public void onLongPressed() { - NotificationHelper.collapseFAService(context, getAdapter().getItemCount()); +// 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 d6de18f..723f39e 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 @@ -1,8 +1,8 @@ package com.fastaccess.ui.modules.floating.apps; +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 +28,9 @@ public static FloatingVHPresenter with(@NonNull BaseFloatingMvp.BaseView - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b871e62..b877965 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -37,7 +37,7 @@ Select Apps Add All Remove All - Click to open FA + Open FA Click here to start FA service About Background color of FA apps list. diff --git a/build.gradle b/build.gradle index ea71441..dc13bc0 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0-alpha2' + classpath 'com.android.tools.build:gradle:2.3.0-beta1' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath 'com.google.gms:google-services:3.0.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f..c582851 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Wed Dec 28 17:46:20 MYT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip