version 1.1.0 in store

shayhaimgalaxys2 · Jan 8, 2023 · 5e09e55 · 5e09e55
1 parent 718e23d
commit 5e09e55
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 19 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,13 +4,13 @@ apply plugin: 'com.google.firebase.crashlytics'
 
 android {
     compileSdkVersion 33
-/**/
+
     defaultConfig {
         applicationId "il.co.buyhome"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 3
-        versionName "1.0"
+        versionCode 5
+        versionName "1.1.0"
     }
 
     signingConfigs {
@@ -51,5 +51,6 @@ dependencies {
 
     implementation 'com.pushwoosh:pushwoosh:6.6.7'
     implementation 'com.pushwoosh:pushwoosh-firebase:6.6.7'
+    implementation 'com.onesignal:OneSignal:[4.0.0, 4.99.99]'
 
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:targetSandboxVersion="2"
-    package="il.co.buyhome"
-    xmlns:dist="http://schemas.android.com/apk/distribution">
+    xmlns:dist="http://schemas.android.com/apk/distribution"
+    package="il.co.buyhome">
 
     <dist:module dist:instant="true" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -11,36 +10,52 @@
         android:name=".App"
         android:allowBackup="false"
         android:icon="@drawable/app_icon"
-        android:roundIcon="@drawable/app_icon_round"
         android:label="@string/app_name"
+        android:roundIcon="@drawable/app_icon_round"
         android:theme="@android:style/Theme.Light.NoTitleBar">
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/app_icon" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_color"
+            android:resource="@color/blue" />
+
         <activity
             android:name="il.co.buyhome.MainActivity"
+            android:launchMode="singleInstance"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme" />
         <activity
             android:name="il.co.buyhome.SplashScreen"
+            android:exported="true"
             android:screenOrientation="portrait"
-            android:theme="@style/SplashTheme"
-            android:exported="true">
-            <intent-filter  >
+            android:theme="@style/SplashTheme">
+            <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
-            <intent-filter
-                android:autoVerify="true">
+            <intent-filter android:autoVerify="true">
+
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="http" android:host="buy-home.co.il" />
-            <data android:scheme="https" />
+                <data
+                    android:host="buy-home.co.il"
+                    android:scheme="http" />
+                <data android:scheme="https" />
             </intent-filter>
         </activity>
 
-        <meta-data android:name="com.pushwoosh.appid" android:value="27259-883DB" />
-        <meta-data android:name="com.pushwoosh.senderid" android:value="@string/fcm_sender_id" />
+        <meta-data
+            android:name="com.pushwoosh.appid"
+            android:value="27259-883DB" />
+        <meta-data
+            android:name="com.pushwoosh.senderid"
+            android:value="@string/fcm_sender_id" />
 
         <!--<service
             android:name=".NotificationsHandler"

diff --git a/app/src/main/java/il/co/buyhome/App.java b/app/src/main/java/il/co/buyhome/App.java
@@ -4,10 +4,12 @@
 
 import com.google.firebase.installations.FirebaseInstallations;
 import com.google.firebase.messaging.FirebaseMessaging;
+import com.onesignal.OneSignal;
 import com.pushwoosh.Pushwoosh;
 
 public class App extends Application {
 
+    public static final String ONESIGNAL_APP_ID = "04f6f3eb-fc98-4d0e-b6f6-79497bda3145";
     private static String deviceId = "";
     static String deviceToken = "";
     private static String deviceAdvertiserId = "";
@@ -18,6 +20,7 @@ public void onCreate() {
         initialFCM();
     }
 
+
     private void initialFCM() {
         FirebaseInstallations.getInstance().getId().addOnCompleteListener(task -> {
             if (task.isSuccessful() && task.getResult() != null) {

diff --git a/app/src/main/java/il/co/buyhome/MainActivity.java b/app/src/main/java/il/co/buyhome/MainActivity.java
@@ -12,6 +12,7 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.onesignal.OneSignal;
 import com.pushwoosh.Pushwoosh;
 
 import java.net.URISyntaxException;
@@ -35,12 +36,28 @@ protected void onCreate(Bundle savedInstanceState) {
         // TODO Auto-generated method stub
         super.onCreate(savedInstanceState);
         Pushwoosh.getInstance().registerForPushNotifications();
+//        initOneSignal();
         setContentView(R.layout.activity_main);
         webView = findViewById(R.id.webView);
         webView.setBackgroundColor(Color.TRANSPARENT);
         initWebView();
     }
 
+    private void initOneSignal() {
+        // Enable verbose OneSignal logging to debug issues if needed.
+        OneSignal.setLogLevel(OneSignal.LOG_LEVEL.VERBOSE, OneSignal.LOG_LEVEL.NONE);
+
+        // OneSignal Initialization
+        OneSignal.initWithContext(this);
+        OneSignal.setAppId(App.ONESIGNAL_APP_ID);
+
+        // promptForPushNotifications will show the native Android notification permission prompt.
+        // We recommend removing the following code and instead using an In-App Message to prompt for notification permission (See step 7)
+        OneSignal.promptForPushNotifications();
+
+    }
+
+
     private void initProgressDialog() {
         progressDialog = new ProgressDialog(MainActivity.this, ProgressDialog.THEME_DEVICE_DEFAULT_LIGHT);
         progressDialog.setMessage(getResources().getString(R.string.loading));

diff --git a/app/src/main/res/drawable/ic_stat_onesignal_default.png b/app/src/main/res/drawable/ic_stat_onesignal_default.png
diff --git a/app/src/main/res/drawable/pw_notification.png b/app/src/main/res/drawable/pw_notification.png
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="white">#ffffff</color>
+    <color name="white_opacity_10">#1affffff</color>
+    <color name="white_opacity_20">#33ffffff</color>
+    <color name="white_opacity_30">#45ffffff</color>
+    <color name="white_opacity_40">#66ffffff</color>
+    <color name="white_opacity_60">#99FFFFFF</color>
+    <color name="white_opacity_80">#CCFFFFFF</color>
+    <color name="white_transparent">#59ffffff</color>
+    <color name="transparent">#00FFFFFF</color>
+    <color name="black">#000000</color>
+    <color name="light_grey_month">#EDF8FF</color>
+    <color name="black_transparent">#22000000</color>
+    <color name="black_transparent_80">#88000000</color>
+    <color name="black_transparent_50">#66000000</color>
+    <color name="gray">#666666</color>
+    <color name="gray_transparent">#22666666</color>
+    <color name="gray_transparent2">#33003659</color>
+    <color name="dark_grey_blue">#3a4b6a</color>
+    <color name="dark_grey_blue_opacity80">#803a4b6a</color>
+    <color name="light_grey">#a63a4b6a</color>
+    <color name="teal_blue">#00a4a6</color>
+    <color name="teal_blue_opacity_20">#1400a4a6</color>
+    <color name="teal_blue_opacity_50">#8000A4A6</color>
+    <color name="cerulean">#009fd4</color>
+    <color name="light_blue_grey">#cfe2f1</color>
+    <color name="light_blue_grey2">#e9f1ff</color>
+    <color name="water_blue">#1976d2</color>
+    <color name="water_blue_opacity_20">#141976d2</color>
+    <color name="red_pink">#f52854</color>
+    <color name="yellowy_brown">#b8860b</color>
+    <color name="yellowy_brown_opacity_20">#14b8860b</color>
+    <color name="duck_egg_blue">#e0eef9</color>
+    <color name="neon_red">#fd0d40</color>
+    <color name="reddish_pink">#ff2951</color>
+    <color name="shadow">#805c5c5c</color>
+    <color name="greyish_brown_50">#803e3e3e</color>
+    <color name="greyish_brown_10">#033E3E3E</color>
+    <color name="reddish_pink_10">#19ff2951</color>
+    <color name="grey_line">#3324287d</color>
+    <color name="azure">#4dc8ce</color>
+    <color name="club_grey_background">#d4e4ed</color>
+    <color name="club_grey">#c1d7e5</color>
+    <color name="dark_grey">#232e3e</color>
+    <color name="card_background">#73dcfc</color>
+    <color name="gradient_transparent_background">#001B5ECE</color>
+    <color name="text_black">#1a1a1a</color>
+    <color name="vouchers_bottom_text_background">#eceff5</color>
+    <color name="blue">#1b5ece</color>
+</resources>
diff --git a/private_key.pepk b/private_key.pepk