Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Gradle 9.3.1 wrapper. Android 7.0 / API 24 is the minimum device version.
# APK: app/build/outputs/apk/debug/app-debug.apk
```

Default API: `https://store.gothwadtech.com/api/`. For an HTTPS staging Worker:
Default API: `https://kiwistore.gothwadtech.com/api/`. For an HTTPS staging Worker:

```sh
./gradlew assembleDebug -PSTORE_API_BASE_URL=https://your-staging-host/api/
Expand Down
8 changes: 4 additions & 4 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ android {
require(it.matches(Regex("[0-9][0-9A-Za-z.+_-]{0,63}"))) { "Invalid versionName" }
}

buildConfigField("String", "STORE_API_BASE_URL", "\"${httpsProperty("STORE_API_BASE_URL", "https://store.gothwadtech.com/api/")}\"")
buildConfigField("String", "CONSOLE_URL", "\"${httpsProperty("CONSOLE_URL", "https://console.gothwadtech.com/")}\"")
buildConfigField("String", "STORE_WEB_URL", "\"${httpsProperty("STORE_WEB_URL", "https://store.gothwadtech.com/")}\"")
buildConfigField("String", "STORE_API_BASE_URL", "\"${httpsProperty("STORE_API_BASE_URL", "https://kiwistore.gothwadtech.com/api/")}\"")
buildConfigField("String", "CONSOLE_URL", "\"${httpsProperty("CONSOLE_URL", "https://kiwiconsole.gothwadtech.com/")}\"")
buildConfigField("String", "STORE_WEB_URL", "\"${httpsProperty("STORE_WEB_URL", "https://kiwistore.gothwadtech.com/")}\"")
buildConfigField("String", "ACCOUNTS_API_BASE_URL", "\"${httpsProperty("ACCOUNTS_API_BASE_URL", "https://accounts.gothwadtech.com/api/")}\"")
buildConfigField("String", "ACCOUNTS_SIGNIN_URL", "\"${httpsProperty("ACCOUNTS_SIGNIN_URL", "https://accounts.gothwadtech.com/")}\"")
buildConfigField("String", "SHIZUKU_DOWNLOAD_URL", "\"${httpsProperty("SHIZUKU_DOWNLOAD_URL", "https://shizuku.rikka.app/")}\"")
buildConfigField("String", "OAUTH_CLIENT_ID", "\"${providers.gradleProperty("OAUTH_CLIENT_ID").orElse("gothwad-store").get()}\"")
buildConfigField("String", "OAUTH_CLIENT_ID", "\"${providers.gradleProperty("OAUTH_CLIENT_ID").orElse("kiwi-store").get()}\"")
buildConfigField("String", "OAUTH_REDIRECT_URI", "\"gothwadstore://oauth/callback\"")

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ fun AccountScreen(vm: StoreViewModel, nav: NavController) {
)
SettingRow(
title = "Developer Console",
subtitle = "Publish and manage your own apps at console.gothwadtech.com",
subtitle = "Publish and manage your own apps at kiwiconsole.gothwadtech.com",
icon = Icons.Filled.Dashboard,
onClick = { nav.navigate(Routes.DEVELOPER_CONSOLE) },
trailingText = "Open",
Expand Down Expand Up @@ -637,7 +637,7 @@ fun AccountDetailsScreen(vm: StoreViewModel, nav: NavController) {
)
SettingRow(
title = "Developer Console",
subtitle = "console.gothwadtech.com",
subtitle = "kiwiconsole.gothwadtech.com",
onClick = { nav.navigate(Routes.DEVELOPER_CONSOLE) },
)
SettingRow(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ private fun HomeContent(
Column(Modifier.padding(Spacing.screenH)) {
DividerLine()
Text(
"Live catalogue · store.gothwadtech.com",
"Live catalogue · kiwistore.gothwadtech.com",
modifier = Modifier.padding(top = 14.dp),
style = MaterialTheme.typography.bodySmall,
color = GothwadTheme.extra.textTertiary,
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/gothwad/store/ui/screens/MiscScreens.kt
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ private fun openUrl(context: android.content.Context, url: String, onFail: (Stri
if (!ok) onFail("No browser is available to open $url")
}

/** console.gothwadtech.com bridge — publishers manage releases there. */
/** kiwiconsole.gothwadtech.com bridge — publishers manage releases there. */
@Composable
fun DeveloperConsoleScreen(vm: StoreViewModel, nav: NavController) {
val context = LocalContext.current
Expand All @@ -86,7 +86,7 @@ fun DeveloperConsoleScreen(vm: StoreViewModel, nav: NavController) {
Row(verticalAlignment = androidx.compose.ui.Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(14.dp)) {
BrandAvatar(text = "GC", size = 46.dp)
Column {
Text("console.gothwadtech.com", fontSize = 16.sp, fontWeight = FontWeight.SemiBold)
Text("kiwiconsole.gothwadtech.com", fontSize = 16.sp, fontWeight = FontWeight.SemiBold)
Text(
"Upload APKs, write listing copy and follow the review queue",
fontSize = 12.sp,
Expand Down Expand Up @@ -228,7 +228,7 @@ fun AboutScreen(vm: StoreViewModel, nav: NavController) {
InfoBanner(
title = "Live data only",
message = "Listings, releases and reviews come from the Gothwad Worker " +
"(store.gothwadtech.com/api). There is no bundled demo catalogue.",
"(kiwistore.gothwadtech.com/api). There is no bundled demo catalogue.",
)
}
}
Expand All @@ -253,12 +253,12 @@ fun AboutScreen(vm: StoreViewModel, nav: NavController) {
)
SettingRow(
title = "Terms of service",
subtitle = "store.gothwadtech.com/terms",
subtitle = "kiwistore.gothwadtech.com/terms",
onClick = { openUrl(context, "${BuildConfig.STORE_WEB_URL}terms") { vm.emit(StoreEvent.Message(it)) } },
)
SettingRow(
title = "Privacy policy",
subtitle = "store.gothwadtech.com/privacy",
subtitle = "kiwistore.gothwadtech.com/privacy",
icon = Icons.Filled.PrivacyTip,
onClick = { openUrl(context, "${BuildConfig.STORE_WEB_URL}privacy") { vm.emit(StoreEvent.Message(it)) } },
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ fun PrivacyScreen(vm: StoreViewModel, nav: NavController) {
item {
InfoBanner(
title = "No trackers, no analytics SDKs",
message = "Kiwi Store talks to two hosts: store.gothwadtech.com (catalogue, downloads, " +
message = "Kiwi Store talks to two hosts: kiwistore.gothwadtech.com (catalogue, downloads, " +
"reviews) and accounts.gothwadtech.com (sign-in). Everything else is on-device.",
)
}
Expand Down Expand Up @@ -558,7 +558,7 @@ fun PrivacyScreen(vm: StoreViewModel, nav: NavController) {
Column(Modifier.padding(Spacing.screenH)) {
Spacer(Modifier.height(10.dp))
Text(
"Full policy: store.gothwadtech.com/privacy",
"Full policy: kiwistore.gothwadtech.com/privacy",
fontSize = 12.sp,
color = GothwadTheme.extra.textTertiary,
)
Expand Down
6 changes: 3 additions & 3 deletions app/src/test/java/com/gothwad/store/CatalogModelsTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,15 @@ class CatalogModelsTest {
@Test
fun `release urls resolve against the api origin`() {
assertEquals(
"https://store.gothwadtech.com/api/download/rel-519dd30f-c4ec-4f28-972a-2ff60437e2bd",
"https://kiwistore.gothwadtech.com/api/download/rel-519dd30f-c4ec-4f28-972a-2ff60437e2bd",
StoreNetwork.downloadUrl("rel-519dd30f-c4ec-4f28-972a-2ff60437e2bd"),
)
assertEquals(
"https://store.gothwadtech.com/api/download/rel-1",
"https://kiwistore.gothwadtech.com/api/download/rel-1",
StoreNetwork.absoluteUrl("/api/download/rel-1"),
)
assertEquals(
"https://store.gothwadtech.com/api/download/rel-1",
"https://kiwistore.gothwadtech.com/api/download/rel-1",
StoreNetwork.absoluteUrl("download/rel-1"),
)
assertEquals(
Expand Down
2 changes: 1 addition & 1 deletion app/src/test/java/com/gothwad/store/InstallActionTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class InstallActionTest {
appId = "app-1",
versionCode = versionCode,
versionName = "1.0.$versionCode",
apkUrl = "https://store.gothwadtech.com/api/download/rel-$versionCode",
apkUrl = "https://kiwistore.gothwadtech.com/api/download/rel-$versionCode",
apkSizeBytes = 4_274_549,
apkSha256 = "cc08fc96d2c386679d4be4058610e8924d206f5976eedbd1bfe7921e7ce423f0",
minSdk = minSdk,
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/check-store-api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import urllib.parse
import urllib.request

BASE = 'https://store.gothwadtech.com/api/'
BASE = 'https://kiwistore.gothwadtech.com/api/'

def read(path):
req = urllib.request.Request(BASE + path, headers={'Accept': 'application/json', 'User-Agent': 'KiwiStore-CI/1.0'})
Expand Down
Loading