Skip to content

Commit 3f35237

Browse files
committed
Pyon-ification
1 parent 69f1348 commit 3f35237

File tree

18 files changed

+33
-31
lines changed

18 files changed

+33
-31
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@ lint/intermediates/
8282
lint/generated/
8383
lint/outputs/
8484
lint/tmp/
85-
# lint/reports/
85+
# lint/reports/

app/src/main/java/dev/beefers/vendetta/manager/domain/manager/DownloadManager.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ class DownloadManager(
2323

2424
suspend fun downloadVendetta(out: File, onProgressUpdate: (Float?) -> Unit) =
2525
download(
26-
"https://github.com/vendetta-mod/VendettaXposed/releases/latest/download/app-release.apk",
26+
"https://github.com/pyoncord/PyoncordXposed/releases/latest/download/app-release.apk",
2727
out,
2828
onProgressUpdate
2929
)
3030

3131
suspend fun downloadUpdate(out: File) =
3232
download(
33-
"https://github.com/vendetta-mod/VendettaManager/releases/latest/download/Manager.apk",
33+
"https://github.com/pyoncord/PyoncordManager/releases/latest/download/Manager.apk",
3434
out
3535
) {
3636
/* TODO: Update a progress bar in the update dialog */
@@ -54,7 +54,7 @@ class DownloadManager(
5454
?: throw IllegalStateException("DownloadManager service is not available")
5555

5656
val downloadId = DownloadManager.Request(Uri.parse(url))
57-
.setTitle("Vendetta Manager")
57+
.setTitle("Pyoncord Manager")
5858
.setDescription("Downloading ${out.name}...")
5959
.setDestinationUri(Uri.fromFile(out))
6060
.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE)

app/src/main/java/dev/beefers/vendetta/manager/domain/manager/InstallManager.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class InstallManager(
2828
when {
2929
Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> {
3030
context.packageManager.getPackageInfo(
31-
prefs.packageName.ifBlank { "dev.beefers.vendetta" },
31+
prefs.packageName.ifBlank { "io.github.pyoncord.app" },
3232
PackageManager.PackageInfoFlags.of(
3333
0L
3434
)
@@ -37,7 +37,7 @@ class InstallManager(
3737

3838
else -> {
3939
context.packageManager.getPackageInfo(
40-
prefs.packageName.ifBlank { "dev.beefers.vendetta" },
40+
prefs.packageName.ifBlank { "io.github.pyoncord.app" },
4141
0
4242
)
4343
}

app/src/main/java/dev/beefers/vendetta/manager/domain/manager/PreferenceManager.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ class PreferenceManager(context: Context) :
1414
BasePreferenceManager(context.getSharedPreferences("prefs", Context.MODE_PRIVATE)) {
1515

1616
val DEFAULT_MODULE_LOCATION =
17-
(context.externalCacheDir ?: File(Environment.getExternalStorageDirectory(), Environment.DIRECTORY_DOWNLOADS).resolve("VendettaManager").also { it.mkdirs() }).resolve("vendetta.apk")
17+
(context.externalCacheDir ?: File(Environment.getExternalStorageDirectory(), Environment.DIRECTORY_DOWNLOADS).resolve("PyoncordManager").also { it.mkdirs() }).resolve("xposed.apk")
1818

19-
var packageName by stringPreference("package_name", "dev.beefers.vendetta")
19+
var packageName by stringPreference("package_name", "io.github.pyoncord.app")
2020

21-
var appName by stringPreference("app_name", "Vendetta")
21+
var appName by stringPreference("app_name", "Pyoncord")
2222

2323
var discordVersion by stringPreference("discord_version", "")
2424

app/src/main/java/dev/beefers/vendetta/manager/installer/step/StepRunner.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ class StepRunner(
4444
private val preferenceManager: PreferenceManager by inject()
4545
private val context: Context by inject()
4646
private val debugInfo = """
47-
Vendetta Manager v${BuildConfig.VERSION_NAME}
47+
Pyoncord Manager v${BuildConfig.VERSION_NAME}
4848
Built from commit ${BuildConfig.GIT_COMMIT} on ${BuildConfig.GIT_BRANCH} ${if (BuildConfig.GIT_LOCAL_CHANGES || BuildConfig.GIT_LOCAL_COMMITS) "(Changes Present)" else ""}
4949
5050
Running Android ${Build.VERSION.RELEASE}, API level ${Build.VERSION.SDK_INT}
5151
Supported ABIs: ${Build.SUPPORTED_ABIS.joinToString()}
5252
Device: ${Build.MANUFACTURER} - ${Build.MODEL} (${Build.DEVICE})
5353
${if(Build.VERSION.SDK_INT > Build.VERSION_CODES.S) "SOC: ${Build.SOC_MANUFACTURER} ${Build.SOC_MODEL}\n" else "\n\n"}
54-
Adding Vendetta to Discord v$discordVersion
54+
Adding Pyoncord to Discord v$discordVersion
5555
5656
5757
""".trimIndent()
@@ -71,7 +71,7 @@ class StepRunner(
7171
private val cacheDir =
7272
context.externalCacheDir
7373
?: File(Environment.getExternalStorageDirectory(), Environment.DIRECTORY_DOWNLOADS)
74-
.resolve("VendettaManager")
74+
.resolve("PyoncordManager")
7575
.also { it.mkdirs() }
7676

7777
/**

app/src/main/java/dev/beefers/vendetta/manager/installer/step/download/DownloadVendettaStep.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import java.io.File
88
/**
99
* Downloads the Vendetta XPosed module
1010
*
11-
* https://github.com/vendetta-mod/VendettaXposed
11+
* https://github.com/pyoncord/PyoncordXposed
1212
*/
1313
@Stable
1414
class DownloadVendettaStep(
@@ -17,8 +17,8 @@ class DownloadVendettaStep(
1717

1818
override val nameRes = R.string.step_dl_vd
1919

20-
override val url: String = "https://github.com/vendetta-mod/VendettaXposed/releases/latest/download/app-release.apk"
20+
override val url: String = "https://github.com/pyoncord/PyoncordXposed/releases/latest/download/app-release.apk"
2121
override val destination = preferenceManager.moduleLocation
22-
override val workingCopy = workingDir.resolve("vendetta.apk")
22+
override val workingCopy = workingDir.resolve("bunny.apk")
2323

2424
}

app/src/main/java/dev/beefers/vendetta/manager/installer/step/patching/AddVendettaStep.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class AddVendettaStep(
2525
override suspend fun run(runner: StepRunner) {
2626
val vendetta = runner.getCompletedStep<DownloadVendettaStep>().workingCopy
2727

28-
runner.logger.i("Adding Vendetta module with LSPatch")
28+
runner.logger.i("Adding Pyoncord module with LSPatch")
2929
val files = signedDir.listFiles()
3030
?.takeIf { it.isNotEmpty() }
3131
?: throw Error("Missing APKs from signing step")

app/src/main/java/dev/beefers/vendetta/manager/installer/util/Signer.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ object Signer : KoinComponent {
5353
val certificate = keyStore.getCertificate(alias) as X509Certificate
5454

5555
ApkSigner.SignerConfig.Builder(
56-
"Vendetta",
56+
"Pyoncord",
5757
keyStore.getKey(alias, password) as PrivateKey,
5858
listOf(certificate)
5959
).build()
@@ -75,7 +75,7 @@ object Signer : KoinComponent {
7575
do serialNumber = SecureRandom().nextInt().toBigInteger()
7676
while (serialNumber < BigInteger.ZERO)
7777

78-
val x500Name = X500Name("CN=Vendetta Manager")
78+
val x500Name = X500Name("CN=Pyoncord Manager")
7979
val pair = KeyPairGenerator.getInstance("RSA").run {
8080
initialize(2048)
8181
generateKeyPair()

app/src/main/java/dev/beefers/vendetta/manager/network/service/RestService.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class RestService(
1616

1717
suspend fun getLatestRelease(repo: String) = withContext(Dispatchers.IO) {
1818
httpService.request<Release> {
19-
url("https://api.github.com/repos/vendetta-mod/$repo/releases/latest")
19+
url("https://api.github.com/repos/$repo/releases/latest")
2020
}
2121
}
2222

@@ -28,7 +28,7 @@ class RestService(
2828

2929
suspend fun getCommits(repo: String, page: Int = 1) = withContext(Dispatchers.IO) {
3030
httpService.request<List<Commit>> {
31-
url("https://api.github.com/repos/vendetta-mod/$repo/commits")
31+
url("https://api.github.com/repos/$repo/commits")
3232
parameter("page", page)
3333
}
3434
}

app/src/main/java/dev/beefers/vendetta/manager/network/utils/CommitsPagingSource.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class CommitsPagingSource(
1717
override suspend fun load(params: LoadParams<Int>): LoadResult<Int, Commit> {
1818
val page = params.key ?: 0
1919

20-
return when (val response = repo.getCommits("Vendetta", page)) {
20+
return when (val response = repo.getCommits("pyoncord/Pyoncord", page)) {
2121
is ApiResponse.Success -> LoadResult.Page(
2222
data = response.data,
2323
prevKey = if (page > 0) page - 1 else null,

app/src/main/java/dev/beefers/vendetta/manager/ui/viewmodel/home/HomeViewModel.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class HomeViewModel(
4242
private val cacheDir = context.externalCacheDir ?: File(
4343
Environment.getExternalStorageDirectory(),
4444
Environment.DIRECTORY_DOWNLOADS
45-
).resolve("VendettaManager").also { it.mkdirs() }
45+
).resolve("PyoncordManager").also { it.mkdirs() }
4646

4747
var discordVersions by mutableStateOf<Map<DiscordVersion.Type, DiscordVersion?>?>(null)
4848
private set
@@ -107,14 +107,14 @@ class HomeViewModel(
107107

108108
private fun checkForUpdate() {
109109
screenModelScope.launch {
110-
release = repo.getLatestRelease("VendettaManager").dataOrNull
110+
release = repo.getLatestRelease("pyoncord/PyoncordManager").dataOrNull
111111
release?.let {
112112
showUpdateDialog = it.tagName.toInt() > BuildConfig.VERSION_CODE
113113
}
114-
repo.getLatestRelease("VendettaXposed").ifSuccessful {
114+
repo.getLatestRelease("pyoncord/PyoncordXposed").ifSuccessful {
115115
if (prefs.moduleVersion != it.tagName) {
116116
prefs.moduleVersion = it.tagName
117-
val module = File(cacheDir, "vendetta.apk")
117+
val module = File(cacheDir, "bunny.apk")
118118
if (module.exists()) module.delete()
119119
}
120120
}

app/src/main/java/dev/beefers/vendetta/manager/ui/viewmodel/settings/AdvancedSettingsViewModel.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class AdvancedSettingsViewModel(
2121
private val context: Context,
2222
private val prefs: PreferenceManager,
2323
) : ScreenModel {
24-
private val cacheDir = context.externalCacheDir ?: File(Environment.getExternalStorageDirectory(), Environment.DIRECTORY_DOWNLOADS).resolve("VendettaManager").also { it.mkdirs() }
24+
private val cacheDir = context.externalCacheDir ?: File(Environment.getExternalStorageDirectory(), Environment.DIRECTORY_DOWNLOADS).resolve("PyoncordManager").also { it.mkdirs() }
2525

2626
fun clearCache() {
2727
cacheDir.deleteRecursively()

app/src/main/java/dev/beefers/vendetta/manager/ui/widgets/AppIcon.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fun AppIcon(
2222
) {
2323
val iconColor = remember(customIcon, releaseChannel) {
2424
when {
25-
customIcon -> Color(0xFF3AB8BA)
25+
customIcon -> Color(0xFF48488B)
2626
releaseChannel == DiscordVersion.Type.ALPHA -> Color(0xFFFBB33C)
2727
else -> Color(0xFF5865F2)
2828
}

app/src/main/java/dev/beefers/vendetta/manager/ui/widgets/settings/ThemePreview.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fun ThemePreview(
2929
val layerModifier = Modifier.height(300.dp)
3030
val iconColor = remember(prefs.patchIcon, prefs.channel) {
3131
when {
32-
prefs.patchIcon -> Color(0xFF3AB8BA)
32+
prefs.patchIcon -> Color(0xFF48488B)
3333
prefs.channel == DiscordVersion.Type.ALPHA -> Color(0xFFFBB33C)
3434
else -> Color(0xFF5865F2)
3535
}

app/src/main/java/dev/beefers/vendetta/manager/utils/Constants.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import dev.beefers.vendetta.manager.BuildConfig
66
object Constants {
77

88
val TEAM_MEMBERS = listOf(
9-
TeamMember("Pylix", "Developer - Vendetta", "amsyarasyiq"),
9+
TeamMember("Pylix", "Developer - Pyoncord/Vendetta", "amsyarasyiq"),
1010
TeamMember("Kasi", "Developer - Xposed Module", "redstonekasi")
1111
)
1212

13-
val VENDETTA_DIR = Environment.getExternalStorageDirectory().resolve("Vendetta")
13+
// NOTE: This is no longer used
14+
val VENDETTA_DIR = Environment.getExternalStorageDirectory().resolve("Pyoncord")
1415

1516
val DUMMY_VERSION = DiscordVersion(1, 0, DiscordVersion.Type.STABLE)
1617

build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
alias(libs.plugins.android.application) apply false
55
alias(libs.plugins.android.library) apply false
66
alias(libs.plugins.kotlin.android) apply false
7+
78
}
89

910
tasks.withType<Copy>().all {

gradlew

100644100755
File mode changed.

settings.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ pluginManagement {
66
}
77
}
88

9-
rootProject.name = "Vendetta Manager"
9+
rootProject.name = "Pyoncord Manager"
1010
include(":app")

0 commit comments

Comments
 (0)