Browse Source

change icon

Leon 1 năm trước cách đây
mục cha
commit
724f135b3c

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
android/app/src/main/assets/index.android.bundle


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
android/app/src/main/assets/index.android.map


+ 31 - 0
android/app/src/main/java/com/hola/HolaModule.java

@@ -1,18 +1,24 @@
 package com.hola;
 
+import static androidx.core.content.ContextCompat.startActivity;
+
+import android.app.Activity;
 import android.app.AlarmManager;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Build;
 import android.os.SystemClock;
+import android.provider.Settings;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
@@ -35,6 +41,31 @@ public class HolaModule extends ReactContextBaseJavaModule {
         return MODULE_NAME;
     }
 
+    @ReactMethod
+    public void openNotificationSettings() {
+        Activity currentActivity = getCurrentActivity();
+        Context context = getReactApplicationContext();
+//        Intent intent = new Intent();
+//        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+//            intent.setAction(Settings.ACTION_APP_NOTIFICATION_SETTINGS);
+//            intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.getPackageName());
+//        } else if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
+//            intent.setAction("android.settings.APP_NOTIFICATION_SETTINGS");
+//            intent.putExtra("app_package", context.getPackageName());
+//            intent.putExtra("app_uid", context.getApplicationInfo().uid);
+//        } else {
+//            intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+//            intent.addCategory(Intent.CATEGORY_DEFAULT);
+//            intent.setData(Uri.parse("package:" + context.getPackageName()));
+//        }
+//        currentActivity.startActivity(intent);
+
+        Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+        Uri uri = Uri.fromParts("package", context.getPackageName(), null);
+        intent.setData(uri);
+        currentActivity.startActivity(intent);
+    }
+
     @ReactMethod
     public void addLocalPush(String title,String content,String time){
         if (getCurrentActivity()==null){

BIN
android/app/src/main/res/drawable-hdpi/ic_stat_onesignal_default.png


BIN
android/app/src/main/res/drawable-mdpi/ic_stat_onesignal_default.png


BIN
android/app/src/main/res/drawable-xhdpi/ic_stat_onesignal_default.png


BIN
android/app/src/main/res/drawable-xxhdpi/ic_stat_onesignal_default.png


BIN
android/app/src/main/res/drawable-xxxhdpi/ic_onesignal_large_icon_default.png


BIN
android/app/src/main/res/drawable-xxxhdpi/ic_stat_onesignal_default.png


BIN
android/app/src/main/res/mipmap-hdpi/ic_launcher.png


BIN
android/app/src/main/res/mipmap-hdpi/ic_stat_onesignal_default.png


BIN
android/app/src/main/res/mipmap-mdpi/ic_launcher.png


BIN
android/app/src/main/res/mipmap-xhdpi/ic_launcher.png


BIN
android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png


BIN
android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png


+ 11 - 9
src/features/daynight/DayNightSwiperPopup.tsx

@@ -153,12 +153,12 @@ export default function DayNightSwiperPopup(props: { authInfo: any }) {
 
     function clearData() {
         showAlert({
-            title:t('feature.location.clear_alert_title'),
-            content:t('feature.location.clear_alert_content'),
-            cancelText:t('feature.location.clear_alert_cancel'),
-            confirmText:t('feature.location.clear_alert_confirm'),
-            showCancel:true,
-            confirm:()=>{
+            title: t('feature.location.clear_alert_title'),
+            content: t('feature.location.clear_alert_content'),
+            cancelText: t('feature.location.clear_alert_cancel'),
+            confirmText: t('feature.location.clear_alert_confirm'),
+            showCancel: true,
+            confirm: () => {
                 clearLocation().then(res => {
                     global.swiperDayNightRefresh()
                     global.refreshNight()
@@ -226,13 +226,15 @@ export default function DayNightSwiperPopup(props: { authInfo: any }) {
                             cancelText: t('feature.auth_sys.location_cancel'),
                             confirmText: t('feature.auth_sys.location_confirm'),
                             confirm: () => {
-                                if (kIsIOS){
+                                if (kIsIOS) {
                                     Linking.openURL('app-settings:')
                                 }
                                 else {
-                                    Linking.openSettings()
+                                    // Linking.openSettings()
+                                    var Jto = require('react-native').NativeModules.HolaModule;
+                                    Jto.openNotificationSettings()
                                 }
-                                
+
                             }
                         })
                     }

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác