From 2ff83feed9331328dc5858cabd0c0290937db175 Mon Sep 17 00:00:00 2001
From: RaindropsSys <raindrops@equestria.dev>
Date: Mon, 20 May 2024 15:02:08 +0200
Subject: Updated 5 files and added build.js

---
 README.md                          | 12 +++++-------
 app/build.gradle                   |  4 ++--
 app/src/main/AndroidManifest.xml   |  1 +
 app/src/main/res/values/values.xml |  3 ++-
 build.js                           | 10 ++++++++++
 settings.gradle                    |  2 +-
 6 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100755 build.js

diff --git a/README.md b/README.md
index b76569f..058efbc 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,19 @@
-# Haven
-This app started as a fork of the [ntfy Android app](https://github.com/binwiederhier/ntfy) ([ntfy.sh](https://ntfy.sh)) made to work with Equestria.dev's notification servers and other technologies and eventually turned into a mobile app for various Equestria.dev services. It is not meant to be used outside of Equestria.dev and will not work without the Equestria.dev servers.
-
-> **Note for Ponypush users:** Upgrading from Ponypush (`dev.equestria.notifications`) is not possible as Haven (`dev.equestria.haven`) uses a different package name. Therefore, you will need to uninstall Ponypush and then install Haven (or keep both installed). 
+# Ponypush
+This app started as a fork of the [ntfy Android app](https://github.com/binwiederhier/ntfy) ([ntfy.sh](https://ntfy.sh)) made to work with Equestria.dev's notification servers. It is not meant to be used outside of Equestria.dev and will not work without the Equestria.dev servers.
 
 ## Build
-In Android Studio, go to Build > Generate Signed Bundle/APK and select `fdroidDebug` or `fdroidRelease`.
+In Android Studio, go to Build > Generate Signed Bundle/APK and select `debug` or `release`.
 
 ## Notable differences with upstream ntfy
 - Revamped UI, with a lot of options removed
   - Most notably, it is not possible to use a third-party server other than notifications.equestria.dev
 - Integration with Equestria.dev's tags
-- Targets Android 15 instead of the upstream Android 13
+- Targets Android 14 instead of the upstream Android 13
 - Requires Android 9 or later instead of Android 5.0 or later
 - Up-to-date dependencies
 
 ## Upstream integration
-When notable changes are made to the official ntfy app, Haven will attempt to integrate such changes as much as possible. However, we cannot guarantee that the implemented features will work the same as with the official ntfy app.
+When notable changes are made to the official ntfy app, Ponypush will attempt to integrate such changes as much as possible. However, we cannot guarantee that the implemented features will work the same as with the official ntfy app.
 
 ## License
 This is a fork of ntfy by [Philipp C. Heckel](https://heckel.io), originally distributed under the Apache License 2.0. This modified application is released under the [GNU Affero General Public License version 3](LICENSE) as per Equestria.dev's policy. 
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index fb30e91..4f92633 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,13 +7,13 @@ apply plugin: 'kotlin-kapt'
 
 android {
     defaultConfig {
-        applicationId "dev.equestria.haven"
+        applicationId "dev.equestria.ponypush"
         minSdkVersion 28
         targetSdkVersion 34
         compileSdk 34
 
         versionCode 146
-        versionName "4.0.0"
+        versionName "3.1.9"
         buildConfigField 'String', "NTFY_VERSION", '"1.16.0"'
 
         buildConfigField 'boolean', 'FIREBASE_AVAILABLE', 'false'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3f8c8a6..92c9980 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,6 +34,7 @@
         <!-- Main activity -->
         <activity
                 android:name=".ui.MainActivity"
+                android:label="@string/app_launch_name"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml
index 57b9822..3c21410 100644
--- a/app/src/main/res/values/values.xml
+++ b/app/src/main/res/values/values.xml
@@ -4,7 +4,8 @@
          The translatable="false" attribute is just an additional safety. -->
 
     <!-- Main app constants -->
-    <string name="app_name" translatable="false">Equestria.dev</string>
+    <string name="app_name" translatable="false">Equestria.dev Ponypush</string>
+    <string name="app_launch_name" translatable="false">Ponypush</string>
     <string name="app_base_url" translatable="false">https://notifications.equestria.dev</string> <!-- If changed, you must also change google-services.json! -->
 
     <!-- Main activity -->
diff --git a/build.js b/build.js
new file mode 100755
index 0000000..773164b
--- /dev/null
+++ b/build.js
@@ -0,0 +1,10 @@
+#!/usr/bin/env node
+const version = require('fs').readFileSync("./app/build.gradle").toString().split("\n").map(i => i.trim()).find(i => i.startsWith("versionName")).split('"')[1];
+
+console.log("Build the project in Android Studio and press any key to publish.");
+process.stdin.setRawMode(true);
+process.stdin.resume();
+process.stdin.on('data', () => {
+    require('child_process').execSync(`curl -v --header "PRIVATE-TOKEN: $(cat ~/.deploy.txt)" --header "Content-Type: multipart/form-data" --upload-file ./app/release/app-release.apk https://source.equestria.dev/api/v4/projects/89/packages/generic/ponypush/${version}/dev.equestria.ponypush.apk`, { stdio: "inherit" });
+    process.exit();
+});
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 2461898..2bbb776 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
-rootProject.name='haven'
+rootProject.name='ponypush'
 include ':app'
-- 
cgit