peterino
/
blastoise
2
1
Fork 0
Code Issues 10 Pull Requests Packages Projects Releases 3 Wiki Activity

Compare commits

base: peterino:cd8c1814ca412e3181671c2a8b650d261b171157
Branches Tags
peterino:integration
peterino:dev/android
peterino:dev/playlists
peterino:0.0.3
peterino:0.0.2
peterino:0.0.1-dev
..
compare: peterino:adc450f14fc05982808d58c53b7b3435b2da66a4
Branches Tags
peterino:integration
peterino:dev/android
peterino:dev/playlists
peterino:0.0.3
peterino:0.0.2
peterino:0.0.1-dev

No commits in common. "cd8c1814ca412e3181671c2a8b650d261b171157" and "adc450f14fc05982808d58c53b7b3435b2da66a4" have entirely different histories.
cd8c1814ca ... adc450f14f

3 changed files with 6 additions and 9 deletions
Show Stats Expand all files Collapse all files

2
android/BlastoiseNative/README.md
View File

@ -33,7 +33,7 @@ adb shell am start -n com.peterino.blastoise/.MainActivity
## MVP scope ## MVP scope
- Defaults to `https://tunes.peterino.com/` and auto-connects on launch. - Defaults to `http://mhsgroove.peterino.com:3001` and auto-connects on launch.
- Saves a server URL locally. - Saves a server URL locally.
- Uses `/api/channels` to establish an authenticated or guest session. - Uses `/api/channels` to establish an authenticated or guest session.
- Supports `/api/auth/login` for named users. - Supports `/api/auth/login` for named users.

2
android/BlastoiseNative/app/src/main/java/com/peterino/blastoise/MainActivity.kt
View File

@ -801,7 +801,7 @@ class MainActivity : Activity(), PlaybackSnapshotListener {
} }
val deckTop = row().apply { gravity = Gravity.CENTER_VERTICAL } val deckTop = row().apply { gravity = Gravity.CENTER_VERTICAL }
val badge = TextView(this).apply { val badge = TextView(this).apply {
text = "TUNE" text = "3001"
textSize = 22f textSize = 22f
typeface = displayFont typeface = displayFont
letterSpacing = 0f letterSpacing = 0f

11
android/BlastoiseNative/app/src/main/java/com/peterino/blastoise/SessionStore.kt
View File

@ -6,8 +6,7 @@ import java.net.URLEncoder
import java.nio.charset.StandardCharsets import java.nio.charset.StandardCharsets
object SessionStore { object SessionStore {
const val defaultServerBaseUrl = "https://tunes.peterino.com" const val defaultServerBaseUrl = "http://mhsgroove.peterino.com:3001"
private const val legacyDefaultServerBaseUrl = "http://mhsgroove.peterino.com:3001"
const val userAgent = "BlastoiseAndroid/0.1" const val userAgent = "BlastoiseAndroid/0.1"
@Volatile @Volatile
@ -21,11 +20,9 @@ object SessionStore {
fun load(context: Context) { fun load(context: Context) {
val prefs = context.getSharedPreferences("blastoise", Context.MODE_PRIVATE) val prefs = context.getSharedPreferences("blastoise", Context.MODE_PRIVATE)
val storedBaseUrl = prefs.getString("serverBaseUrl", defaultServerBaseUrl).orEmpty().trim() serverBaseUrl = prefs.getString("serverBaseUrl", defaultServerBaseUrl) ?: defaultServerBaseUrl
serverBaseUrl = when { if (serverBaseUrl.isBlank()) {
storedBaseUrl.isBlank() -> defaultServerBaseUrl serverBaseUrl = defaultServerBaseUrl
storedBaseUrl.trimEnd('/') == legacyDefaultServerBaseUrl -> defaultServerBaseUrl
else -> storedBaseUrl.trimEnd('/')
} }
cookieHeader = prefs.getString("cookieHeader", "") ?: "" cookieHeader = prefs.getString("cookieHeader", "") ?: ""
themeKey = prefs.getString("themeKey", "seraph") ?: "seraph" themeKey = prefs.getString("themeKey", "seraph") ?: "seraph"