bvandeusen
0b72827682
Two regressions surfaced on the first real device run.
1. Contrast on ServerUrl + Login screens: both wrapped content in a
bare Box(fillMaxSize), no Surface. The obsidian background never
painted (rendered against the system root view's default),
LocalContentColor cascade fell through to Material's default
contentColor — the screens rendered as near-invisible dark text
on dark grey. Wrap both in Surface(color = background, contentColor
= onBackground) so the bg paints AND the M3 contentColor pipeline
flows correctly through OutlinedTextField labels / cursor /
placeholders + the Button content tint.
2. The bigger bug: NetworkModule.provideRetrofit read
authStore.baseUrl.value ONCE at Retrofit creation. AuthStore loads
from Room async, so at injection time the value was still the
localhost:8080 placeholder. Result: even after the user typed
their real server URL on the ServerUrl screen, every API call
kept hitting localhost:8080 ("Failed to connect to
localhost/127.0.0.1:8080" on the login attempt). The pre-fix
NetworkModule comment even acknowledged it — *"Server-URL
changes require an app relaunch"*.
Fix: per-request rewrite. New BaseUrlInterceptor reads the live
AuthStore.baseUrl.value on every request and rewrites
scheme/host/port of the outgoing URL. Retrofit now keeps a
placeholder baseUrl ("http://placeholder.invalid/") solely to
satisfy its parser; the actual target host is dynamic. Order in
OkHttp chain: BaseUrl first → Auth → logging, so the cookie
interceptor sees the final URL.
New:
- api/BaseUrlInterceptor.kt — per-request scheme/host/port rewrite
from AuthStore.baseUrl. Falls through to the original request
when the stored URL is unparseable.
Modified:
- api/NetworkModule.kt — adds BaseUrlInterceptor to the OkHttp
chain. Drops the AuthStore dependency from provideRetrofit;
swaps baseUrl for the placeholder.
- auth/ui/ServerUrlScreen.kt — Box → Surface wrap.
- auth/ui/LoginScreen.kt — Box → Surface wrap.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
123 lines
3.5 KiB
XML
123 lines
3.5 KiB
XML
<component name="ProjectCodeStyleConfiguration">
|
|
<code_scheme name="Project" version="173">
|
|
<JetCodeStyleSettings>
|
|
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
|
</JetCodeStyleSettings>
|
|
<codeStyleSettings language="XML">
|
|
<option name="FORCE_REARRANGE_MODE" value="1" />
|
|
<indentOptions>
|
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
|
</indentOptions>
|
|
<arrangement>
|
|
<rules>
|
|
<section>
|
|
<rule>
|
|
<match>
|
|
<AND>
|
|
<NAME>xmlns:android</NAME>
|
|
<XML_ATTRIBUTE />
|
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
|
</AND>
|
|
</match>
|
|
</rule>
|
|
</section>
|
|
<section>
|
|
<rule>
|
|
<match>
|
|
<AND>
|
|
<NAME>xmlns:.*</NAME>
|
|
<XML_ATTRIBUTE />
|
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
|
</AND>
|
|
</match>
|
|
<order>BY_NAME</order>
|
|
</rule>
|
|
</section>
|
|
<section>
|
|
<rule>
|
|
<match>
|
|
<AND>
|
|
<NAME>.*:id</NAME>
|
|
<XML_ATTRIBUTE />
|
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
|
</AND>
|
|
</match>
|
|
</rule>
|
|
</section>
|
|
<section>
|
|
<rule>
|
|
<match>
|
|
<AND>
|
|
<NAME>.*:name</NAME>
|
|
<XML_ATTRIBUTE />
|
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
|
</AND>
|
|
</match>
|
|
</rule>
|
|
</section>
|
|
<section>
|
|
<rule>
|
|
<match>
|
|
<AND>
|
|
<NAME>name</NAME>
|
|
<XML_ATTRIBUTE />
|
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
|
</AND>
|
|
</match>
|
|
</rule>
|
|
</section>
|
|
<section>
|
|
<rule>
|
|
<match>
|
|
<AND>
|
|
<NAME>style</NAME>
|
|
<XML_ATTRIBUTE />
|
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
|
</AND>
|
|
</match>
|
|
</rule>
|
|
</section>
|
|
<section>
|
|
<rule>
|
|
<match>
|
|
<AND>
|
|
<NAME>.*</NAME>
|
|
<XML_ATTRIBUTE />
|
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
|
</AND>
|
|
</match>
|
|
<order>BY_NAME</order>
|
|
</rule>
|
|
</section>
|
|
<section>
|
|
<rule>
|
|
<match>
|
|
<AND>
|
|
<NAME>.*</NAME>
|
|
<XML_ATTRIBUTE />
|
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
|
</AND>
|
|
</match>
|
|
<order>ANDROID_ATTRIBUTE_ORDER</order>
|
|
</rule>
|
|
</section>
|
|
<section>
|
|
<rule>
|
|
<match>
|
|
<AND>
|
|
<NAME>.*</NAME>
|
|
<XML_ATTRIBUTE />
|
|
<XML_NAMESPACE>.*</XML_NAMESPACE>
|
|
</AND>
|
|
</match>
|
|
<order>BY_NAME</order>
|
|
</rule>
|
|
</section>
|
|
</rules>
|
|
</arrangement>
|
|
</codeStyleSettings>
|
|
<codeStyleSettings language="kotlin">
|
|
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
|
</codeStyleSettings>
|
|
</code_scheme>
|
|
</component> |