diff --git a/app/build.gradle b/app/build.gradle index 452049c972..1d28ce5746 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "org.ole.planet.myplanet" minSdkVersion 26 targetSdkVersion 34 - versionCode 2235 - versionName "0.22.35" + versionCode 2236 + versionName "0.22.36" ndkVersion '21.3.6528147' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true @@ -101,8 +101,6 @@ android { def planetCambridgePin = project.findProperty('PLANET_CAMBRIDGE_PIN') ?: "" //def planetEgdirbmacUrl = project.findProperty('PLANET_EGDIRBMAC_URL') ?: "" //def planetEgdirbmacPin = project.findProperty('PLANET_EGDIRBMAC_PIN') ?: "" - def planetPalmBayUrl = project.findProperty('PLANET_PALMBAY_URL') ?: "" - def planetPalmBayPin = project.findProperty('PLANET_PALMBAY_PIN') ?: "" buildTypes.each { it.buildConfigField 'String', 'PLANET_LEARNING_URL', "\"$planetLearningUrl\"" @@ -135,8 +133,6 @@ android { it.buildConfigField 'String', 'PLANET_CAMBRIDGE_PIN', "\"${planetCambridgePin}\"" //it.buildConfigField 'String', 'PLANET_EGDIRBMAC_URL', "\"${planetEgdirbmacUrl}\"" //it.buildConfigField 'String', 'PLANET_EGDIRBMAC_PIN', "\"${planetEgdirbmacPin}\"" - it.buildConfigField 'String', 'PLANET_PALMBAY_URL', "\"${planetPalmBayUrl}\"" - it.buildConfigField 'String', 'PLANET_PALMBAY_PIN', "\"${planetPalmBayPin}\"" } } diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/sync/SyncActivity.kt b/app/src/main/java/org/ole/planet/myplanet/ui/sync/SyncActivity.kt index d1dda0345a..cdedffa889 100644 --- a/app/src/main/java/org/ole/planet/myplanet/ui/sync/SyncActivity.kt +++ b/app/src/main/java/org/ole/planet/myplanet/ui/sync/SyncActivity.kt @@ -609,7 +609,6 @@ abstract class SyncActivity : ProcessUserDataActivity(), SyncListener, CheckVers ServerAddressesModel(getString(R.string.sync_embakasi), BuildConfig.PLANET_EMBAKASI_URL), ServerAddressesModel(getString(R.string.sync_cambridge), BuildConfig.PLANET_CAMBRIDGE_URL), //ServerAddressesModel(getString(R.string.sync_egdirbmac), BuildConfig.PLANET_EGDIRBMAC_URL), - ServerAddressesModel(getString(R.string.sync_palmbay), BuildConfig.PLANET_PALMBAY_URL) ) val storedUrl = settings.getString("serverURL", null) @@ -704,7 +703,6 @@ abstract class SyncActivity : ProcessUserDataActivity(), SyncListener, CheckVers BuildConfig.PLANET_EMBAKASI_URL to BuildConfig.PLANET_EMBAKASI_PIN, BuildConfig.PLANET_CAMBRIDGE_URL to BuildConfig.PLANET_CAMBRIDGE_PIN, // BuildConfig.PLANET_EGDIRBMAC_URL to BuildConfig.PLANET_EGDIRBMAC_PIN, - BuildConfig.PLANET_PALMBAY_URL to BuildConfig.PLANET_PALMBAY_PIN ) return pinMap[url] ?: "" } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e6d7518f6f..e62dda005c 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1137,7 +1137,6 @@ 🇰🇪 planet embakasi 🇺🇸 planet cambridge 🇺🇸 planet egdirbmac - 🇺🇸 planet palmbay لديك %1$d %2$s لإكماله عرض أقل عرض المزيد diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ddacbab0ac..ccefd1dfa5 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1136,7 +1136,6 @@ 🇰🇪 planet embakasi 🇺🇸 planet cambridge 🇺🇸 planet egdirbmac - 🇺🇸 planet palmbay Tienes %1$d %2$s para completar mostrar menos mostrar más diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 945462bdaf..9af9e832f9 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1137,7 +1137,6 @@ 🇰🇪 planet embakasi 🇺🇸 planet cambridge 🇺🇸 planet egdirbmac - 🇺🇸 planet palmbay Vous avez %1$d %2$s à compléter montrer moins montrer plus diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index b1af02ddfd..efb7f35c5e 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -1137,7 +1137,6 @@ 🇰🇪 planet embakasi 🇺🇸 planet cambridge 🇺🇸 planet egdirbmac - 🇺🇸 planet palmbay तपाईंको %1$d %2$s पूरा गर्न बाँकी छ कम देखाउनुहोस् थप देखाउनुहोस् diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml index 683d5ed381..c483bb4a1f 100644 --- a/app/src/main/res/values-so/strings.xml +++ b/app/src/main/res/values-so/strings.xml @@ -1137,7 +1137,6 @@ 🇰🇪 planet embakasi 🇺🇸 planet cambridge 🇺🇸 planet egdirbmac - 🇺🇸 planet palmbay Waxaad haysataa %1$d %2$s oo ay tahay inaad dhammaystirto tus wax yar tus wax badan diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a49626ea20..c232bc36bc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1137,7 +1137,6 @@ 🇰🇪 planet embakasi 🇺🇸 planet cambridge 🇺🇸 planet egdirbmac - 🇺🇸 planet palmbay You have %1$d %2$s to complete show less show more diff --git a/gradle.properties b/gradle.properties index 42b9023cc6..68ccc274fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -54,5 +54,3 @@ PLANET_CAMBRIDGE_PIN=6407 # took egdirbmac cause planet on cambridge is at 8080 #PLANET_EGDIRBMAC_URL=planet.cambridge.ole.org #PLANET_EGDIRBMAC_PIN=1565 -PLANET_PALMBAY_URL=planet.palmbay.ole.org -PLANET_PALMBAY_PIN=9699