Merge remote-tracking branch 'origin/canary' into canary

siavash79 · Jun 19, 2024 · f6ed4da · f6ed4da
2 parents 314dc85 + 401b33f
commit f6ed4da
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/CanaryChangelog.md b/CanaryChangelog.md
@@ -1,3 +1,8 @@
+**canary-368**  
+- A15beta3: fixed a bootloop caused by statusbar mods  
+- A15beta3: fixed QS light theme  
+- A15beta3: fixed multi row statusbar - system icons  
+
 **canary-367**  
 - physical buttons remap: bugfix  
 

diff --git a/MagiskModBase/module.prop b/MagiskModBase/module.prop
@@ -1,7 +1,7 @@
 id=PixelXpert
 name=Pixel Xpert
-version=canary-367
-versionCode=367
+version=canary-368
+versionCode=368
 author=Pixel Xpert Team
 description=Xposed based module for customizations on Pixel roms. Android 13+
 updateJson=https://raw.githubusercontent.com/siavash79/PixelXpert/canary/MagiskModuleUpdate_Xposed.json

diff --git a/MagiskModuleUpdate_Full.json b/MagiskModuleUpdate_Full.json
@@ -1,6 +1,6 @@
 {
-  "version": "canary-367",
-  "versionCode": 367,
+  "version": "canary-368",
+  "versionCode": 368,
   "zipUrl": "https://github.com/siavash79/PixelXpert/releases/download/canary_builds/PixelXpert.zip",
   "changelog": "https://raw.githubusercontent.com/siavash79/PixelXpert/canary/CanaryChangelog.md"
 }
diff --git a/MagiskModuleUpdate_Xposed.json b/MagiskModuleUpdate_Xposed.json
@@ -1,6 +1,6 @@
 {
-  "version": "canary-367",
-  "versionCode": 367,
+  "version": "canary-368",
+  "versionCode": 368,
   "zipUrl": "https://github.com/siavash79/PixelXpert/releases/download/canary_builds/PixelXpert.zip",
   "changelog": "https://raw.githubusercontent.com/siavash79/PixelXpert/canary/CanaryChangelog.md"
 }
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
 		applicationId "sh.siava.pixelxpert"
 		minSdk 33
 		targetSdk 34
-		versionCode 367
-		versionName "canary-367"
+		versionCode 368
+		versionName "canary-368"
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}

diff --git a/latestCanary.json b/latestCanary.json
@@ -1,6 +1,6 @@
 {
-    "version": "canary-367",
-    "versionCode": 367,
+    "version": "canary-368",
+    "versionCode": 368,
     "zipUrl_Xposed": "https://github.com/siavash79/PixelXpert/releases/download/canary_builds/PixelXpert.zip",
     "zipUrl_Full": "https://github.com/siavash79/PixelXpert/releases/download/canary_builds/PixelXpert.zip",
     "changelog": "https://raw.githubusercontent.com/siavash79/PixelXpert/canary/CanaryChangelog.md"