bvandeusen/minstrel
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 39 Wiki Activity

fix(android): unblock first device test — auth contrast + dynamic base URL

Browse Source 
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>
This commit is contained in:
Bryan Van Deusen
2026-05-26 00:27:05 -04:00
parent 0415b5ccc3
commit 0b72827682
5553 changed files with 63548 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-be/values-be.xml
+133
View File
@@ -0,0 +1,133 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
<string msgid="8719607706653693137" name="androidx_compose_foundation_autofill">"Аўтазапаўненне"</string>
<string msgid="1150566100598813236" name="androidx_compose_ui_autofill">"Аўтазапаўненне"</string>
<string msgid="881409763997275156" name="call_notification_answer_action">"Адказаць"</string>
<string msgid="8793775615905189152" name="call_notification_answer_video_action">"Відэа"</string>
<string msgid="3229508546291798546" name="call_notification_decline_action">"Адхіліць"</string>
<string msgid="2659457946726154263" name="call_notification_hang_up_action">"Завяршыць"</string>
<string msgid="6107532579223922871" name="call_notification_incoming_text">"Уваходны выклік"</string>
<string msgid="8623827134497363134" name="call_notification_ongoing_text">"Бягучы выклік"</string>
<string msgid="59049573811482460" name="call_notification_screening_text">"Фільтраванне ўваходнага выкліку"</string>
<string msgid="406453423630273620" name="close_drawer">"Закрыць меню навігацыі"</string>
<string msgid="7573152094250666567" name="close_sheet">"Закрыць аркуш"</string>
<string msgid="8038256446254964252" name="default_error_message">"Памылка ўводу"</string>
<string name="default_notification_channel_name">Зараз іграе</string>
<string msgid="6312721426453364202" name="default_popup_window_title">"Усплывальнае акно"</string>
<string msgid="1890207353314751437" name="dropdown_menu">"Выпадное меню"</string>
<string name="error_message_authentication_expired">Каб выкарыстоўваць гэту праграму, увайдзіце</string>
<string name="error_message_bad_value">Уведзены няправільныя даныя</string>
<string name="error_message_concurrent_stream_limit">Праслухоўванне адбываецца на занадта вялікай колькасці прылад</string>
<string name="error_message_content_already_playing">Гэта змесціва ўжо прайграецца</string>
<string name="error_message_disconnected">Вы адключыліся ад мультымедыйнай праграмы</string>
<string name="error_message_end_of_playlist">У чарзе пуста</string>
<string name="error_message_fallback">Узнікла памылка. Паўтарыце спробу пазней.</string>
<string name="error_message_info_cancelled">Не ўдалося завяршыць дзеянне. Паўтарыце спробу.</string>
<string name="error_message_invalid_state">Не ўдаецца выканаць гэты запыт</string>
<string name="error_message_io">Памылка ўводу або вываду</string>
<string name="error_message_not_available_in_region">Не ўдалося загрузіць змесціва ў гэтым рэгіёне</string>
<string name="error_message_not_supported">Дзеянне недаступнае ў гэтай праграме</string>
<string name="error_message_parental_control_restricted">Гэта змесціва заблакіравана</string>
<string name="error_message_permission_denied">У доступе адмоўлена</string>
<string name="error_message_premium_account_required">Даступна для платных уліковых запісаў</string>
<string name="error_message_setup_required">Патрабуецца наладжванне</string>
<string name="error_message_skip_limit_reached">Прапускаць трэкі больш нельга</string>
<string name="exo_download_completed">Спампоўка завершана</string>
<string name="exo_download_description">Спампаваць</string>
<string name="exo_download_downloading">Спампоўваецца</string>
<string name="exo_download_failed">Збой спампоўкі</string>
<string name="exo_download_notification_channel_name">Спампоўкі</string>
<string name="exo_download_paused">Спампоўкі прыпынены</string>
<string name="exo_download_paused_for_network">Спампоўкі чакаюць падключэння да сеткі</string>
<string name="exo_download_paused_for_wifi">Спампоўкі чакаюць падключэння да Wi-Fi</string>
<string name="exo_download_removing">Выдаленне спамповак</string>
<string msgid="6827826412747255547" name="in_progress">"У працэсе"</string>
<string msgid="7933458017204019916" name="indeterminate">"Выбрана часткова"</string>
<string msgid="2988463736136100848" name="m3c_bottom_sheet_collapse_description">"Згарнуць ніжні аркуш"</string>
<string msgid="1555567894577437024" name="m3c_bottom_sheet_dismiss_description">"Закрыць ніжні аркуш"</string>
<string msgid="8403354765404029791" name="m3c_bottom_sheet_drag_handle_description">"Маркер перацягвання"</string>
<string msgid="6670819569745899763" name="m3c_bottom_sheet_expand_description">"Разгарнуць ніжні аркуш"</string>
<string msgid="3010635850035863127" name="m3c_bottom_sheet_pane_title">"Ніжні аркуш"</string>
<string msgid="8166741421776570875" name="m3c_date_input_headline">"Уведзеная дата"</string>
<string msgid="229313757840775812" name="m3c_date_input_headline_description">"Уведзеная дата: %1$s"</string>
<string msgid="6116910750161463197" name="m3c_date_input_invalid_for_pattern">"Дата не адпавядае ўзору: %1$s"</string>
<string msgid="2521768508935305279" name="m3c_date_input_invalid_not_allowed">"Дата забаронена: %1$s"</string>
<string msgid="7052898923934555305" name="m3c_date_input_invalid_year_range">"Дата выходзіць за дазволены дыяпазон гадоў %1$s-%2$s"</string>
<string msgid="2895559812010326913" name="m3c_date_input_label">"Дата"</string>
<string msgid="1237013946323089826" name="m3c_date_input_no_input_description">"Без абмежаванняў"</string>
<string msgid="7306227249789210568" name="m3c_date_input_title">"Выберыце дату"</string>
<string msgid="7605002211875882969" name="m3c_date_picker_headline">"Выбраная дата"</string>
<string msgid="3664277305226978227" name="m3c_date_picker_headline_description">"Бягучы выбар: %1$s"</string>
<string msgid="8436650776581492840" name="m3c_date_picker_navigate_to_year_description">"Перайсці ў год %1$s"</string>
<string msgid="5811000998184572395" name="m3c_date_picker_no_selection_description">"Без абмежаванняў"</string>
<string msgid="7813882352367152251" name="m3c_date_picker_scroll_to_earlier_years">"Прагартайце экран, каб прагледзець ранейшыя гады"</string>
<string msgid="5727367015496556177" name="m3c_date_picker_scroll_to_later_years">"Прагартайце экран, каб прагледзець пазнейшыя гады"</string>
<string msgid="1804346892470238807" name="m3c_date_picker_switch_to_calendar_mode">"Пераключыцца ў рэжым уводу \"Каляндар\""</string>
<string msgid="395627960681594326" name="m3c_date_picker_switch_to_day_selection">"Правядзіце пальцам, каб выбраць год, або націсніце, каб вярнуцца да выбару даты"</string>
<string msgid="2219746470065162704" name="m3c_date_picker_switch_to_input_mode">"Пераключыцца ў рэжым уводу \"Тэкст\""</string>
<string msgid="7142101321095356500" name="m3c_date_picker_switch_to_next_month">"Перайсці да наступнага месяца"</string>
<string msgid="228438865139394590" name="m3c_date_picker_switch_to_previous_month">"Перайсці да папярэдняга месяца"</string>
<string msgid="791651718641787594" name="m3c_date_picker_switch_to_year_selection">"Перайсці да выбару года"</string>
<string msgid="7430790972741451689" name="m3c_date_picker_title">"Выберыце дату"</string>
<string msgid="3199387177749801575" name="m3c_date_picker_today_description">"Сёння"</string>
<string msgid="2068382232816991922" name="m3c_date_picker_year_picker_pane_title">"Бачны інструмент выбару года"</string>
<string msgid="3190049423327661366" name="m3c_date_range_input_invalid_range_input">"Уведзены няправільны дыяпазон дат"</string>
<string msgid="3148384720560189467" name="m3c_date_range_input_title">"Увядзіце даты"</string>
<string msgid="2138321128465719402" name="m3c_date_range_picker_day_in_range">"У межах дыяпазону"</string>
<string msgid="4947636797751277713" name="m3c_date_range_picker_end_headline">"Дата заканчэння"</string>
<string msgid="602077859540990149" name="m3c_date_range_picker_scroll_to_next_month">"Прагартайце экран, каб прагледзець наступны месяц"</string>
<string msgid="4592174524846109496" name="m3c_date_range_picker_scroll_to_previous_month">"Прагартайце экран, каб прагледзець мінулы месяц"</string>
<string msgid="4665981448952749820" name="m3c_date_range_picker_start_headline">"Дата пачатку"</string>
<string msgid="3134165431120340385" name="m3c_date_range_picker_title">"Выберыце даты"</string>
<string msgid="7617233117134790350" name="m3c_dialog">"Дыялогавае акно"</string>
<string msgid="3177828188723359358" name="m3c_dropdown_menu_collapsed">"Згорнута"</string>
<string msgid="2360841780724299882" name="m3c_dropdown_menu_expanded">"Разгорнута"</string>
<string msgid="8687821690726149911" name="m3c_dropdown_menu_toggle">"Уключыць (выключыць) выпадное меню"</string>
<string msgid="6072492480528318635" name="m3c_floating_toolbar_collapse">"Згарнуць панэль інструментаў"</string>
<string msgid="6880757017246780255" name="m3c_floating_toolbar_expand">"Разгарнуць панэль інструментаў"</string>
<string msgid="6152806324422087846" name="m3c_search_bar_search">"Пошук"</string>
<string msgid="6152755701819882931" name="m3c_snackbar_dismiss">"Закрыць"</string>
<string msgid="3868801555855510515" name="m3c_snackbar_pane_title">"Абвестка"</string>
<string msgid="7655536806087401899" name="m3c_suggestions_available">"Прапановы ўнізе"</string>
<string msgid="409352516511718051" name="m3c_time_input_dialog_title">"Увядзіце час"</string>
<string msgid="2786685010796619560" name="m3c_time_picker_am">"да паўдня"</string>
<string msgid="7412665527536641863" name="m3c_time_picker_dialog_title">"Выберыце час"</string>
<string msgid="2349193472625211372" name="m3c_time_picker_hour">"Гадзіны"</string>
<string msgid="9179527532316922345" name="m3c_time_picker_hour_24h_suffix">"%1$d гадз"</string>
<string msgid="8876759303332837035" name="m3c_time_picker_hour_selection">"Выберыце гадзіны"</string>
<string msgid="3458167507790628988" name="m3c_time_picker_hour_suffix">"%1$d гадз"</string>
<string msgid="6973808109666874069" name="m3c_time_picker_hour_text_field">"гадзіны"</string>
<string msgid="4313071914266462005" name="m3c_time_picker_minute">"Хвіліны"</string>
<string msgid="4699133535056739733" name="m3c_time_picker_minute_selection">"Выберыце хвіліны"</string>
<string msgid="5064177921781937179" name="m3c_time_picker_minute_suffix">"%1$d хв"</string>
<string msgid="7661234488295443182" name="m3c_time_picker_minute_text_field">"хвіліны"</string>
<string msgid="5865171949528594571" name="m3c_time_picker_period_toggle_description">"Выберыце AM (да паўдня) або PM (пасля паўдня)"</string>
<string msgid="6616362054113087709" name="m3c_time_picker_pm">"пасля паўдня"</string>
<string msgid="4145073906612931838" name="m3c_time_picker_toggle_keyboard">"Пераключыцца на тэкставы рэжым уводу, каб указаць час"</string>
<string msgid="8841786098195101324" name="m3c_time_picker_toggle_touch">"Пераключыцца на рэжым гадзінніка, каб указаць час"</string>
<string msgid="1805687647081129904" name="m3c_tooltip_long_press_label">"Паказваць усплывальую падказку"</string>
<string msgid="5460405025248574620" name="m3c_tooltip_pane_description">"Падказка"</string>
<string msgid="6564222473543418073" name="m3c_wide_navigation_rail_close_rail">"Закрыць планку"</string>
<string msgid="8350283435461615411" name="m3c_wide_navigation_rail_pane_title">"Планка навігацыі"</string>
<string name="media3_controls_pause_description">Прыпыніць</string>
<string name="media3_controls_play_description">Прайграць</string>
<string name="media3_controls_seek_back_description">Перайсці назад</string>
<string name="media3_controls_seek_forward_description">Перайсці ўперад</string>
<string name="media3_controls_seek_to_next_description">Перайсці да наступнага элемента</string>
<string name="media3_controls_seek_to_previous_description">Перайсці да папярэдняга элемента</string>
<string msgid="542007171693138492" name="navigation_menu">"Меню навігацыі"</string>
<string msgid="6610465462668679431" name="not_selected">"Не выбрана"</string>
<string msgid="5941395253238309765" name="range_end">"Канец пераліку"</string>
<string msgid="7097486360902471446" name="range_start">"Пачатак пераліку"</string>
<string msgid="6043586758067023" name="selected">"Выбрана"</string>
<string msgid="2792228137354697160" name="snackbar_pane_title">"Абвестка"</string>
<string msgid="4139871816613051306" name="state_empty">"Змесціва няма"</string>
<string msgid="5834637030682409883" name="state_off">"Выключана"</string>
<string msgid="1490883874751719580" name="state_on">"Уключана"</string>
<string msgid="6277540029070332960" name="status_bar_notification_info_overflow">"999+"</string>
<string msgid="2561197295334830845" name="switch_role">"Пераключальнік"</string>
<string msgid="1672349317127674378" name="tab">"Укладка"</string>
<string msgid="5946805113151406391" name="template_percent">"Працэнтаў: <ns1:g id="PERCENTAGE">%1$d</ns1:g>."</string>
<string msgid="3765533235322692011" name="tooltip_description">"падказка"</string>
<string msgid="3124740595719787496" name="tooltip_label">"паказаць усплывальную падказку"</string>
</resources>