RWS branch initial store tab

android/app/src/main/AndroidManifest.xml

@@ -78,7 +78,6 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="custom-boot-config-url"
                     android:scheme="pebble" />
             </intent-filter>
 
@@ -162,4 +161,4 @@
             android:exported="true"
             tools:ignore="ExportedContentProvider" />
     </application>
-</manifest>
+</manifest>

lang/en.json

@@ -243,5 +243,10 @@
     "get_apps": "Get watch apps",
     "incompatible_faces": "Incompatible Watch Faces",
     "incompatible_apps": "Incompatible Watch Apps"
+  },
+  "store_page": {
+    "faces": "Watchfaces",
+    "apps": "Apps",
+    "search_bar": "Search for something..."
   }
 }

lib/background/actions/calendar_action_handler.dart

@@ -80,7 +80,7 @@ class CalendarActionHandler implements ActionHandler {
     final calendarList =
     await (_calendarList.streamWithExistingValue.firstSuccessOrError() as FutureOr<AsyncValue<List<SelectableCalendar>>>);
 
-    final calendars = calendarList.data?.value;
+    final calendars = calendarList.value;
     if (calendars == null) {
       return TimelineActionResponse(false);
     }

lib/background/main_background.dart

@@ -65,7 +65,7 @@ class BackgroundReceiver implements TimelineCallbacks {
       final asyncValue =
           await container.readUntilFirstSuccessOrError(preferencesProvider);
 
-      return asyncValue.data!.value;
+      return asyncValue.value!;
     });
 
     TimelineCallbacks.setup(this);

lib/domain/api/appstore/appstore.dart

@@ -8,11 +8,11 @@ import 'package:cobble/infrastructure/datasources/web_services/appstore.dart';
 
 final appstoreServiceProvider = FutureProvider<AppstoreService>((ref) async {
   final boot = await (await ref.watch(bootServiceProvider.future)).config;
-  final token = await (await ref.watch(tokenProvider.last));
+  final token = await (await ref.watch(tokenProvider.future));
   final oauth = await ref.watch(oauthClientProvider.future);
   final prefs = await ref.watch(preferencesProvider.future);
   if (token == null) {
     throw NoTokenException("Service requires a token but none was found in storage");
   }
   return AppstoreService(boot.appstore.base, prefs, oauth, token);
-});
+});

lib/domain/api/auth/auth.dart

@@ -9,7 +9,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 final authServiceProvider = FutureProvider<AuthService>((ref) async {
   final boot = await (await ref.watch(bootServiceProvider.future)).config;
-  final token = await (await ref.watch(tokenProvider.last));
+  final token = await (await ref.watch(tokenProvider.future));
   final oauth = await ref.watch(oauthClientProvider.future);
   final prefs = await ref.watch(preferencesProvider.future);
   if (token == null) {

lib/domain/api/boot/boot.dart

@@ -3,5 +3,5 @@ import 'package:cobble/infrastructure/datasources/web_services/boot.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 final bootServiceProvider = FutureProvider<BootService>(
-  (ref) async => BootService(await ref.watch(bootUrlProvider.last) ?? ""),
-);
+  (ref) async => BootService(await ref.watch(bootUrlProvider.future) ?? ""),
+);

lib/domain/calendar/calendar_list.dart

@@ -32,7 +32,7 @@ class CalendarList extends StateNotifier<AsyncValue<List<SelectableCalendar>>> {
         await _permissionCheck.hasCalendarPermission();
 
     if (hasCalendarPermission.value == false) {
-      return AsyncValue.error([ResultError(0, "No permission")]);
+      return AsyncValue.error([ResultError(0, "No permission")], StackTrace.current);
     }
 
     final preferences = await _preferencesFuture;
@@ -43,7 +43,7 @@ class CalendarList extends StateNotifier<AsyncValue<List<SelectableCalendar>>> {
 
     final calendars = await _deviceCalendarPlugin.retrieveCalendars();
     if (!calendars.isSuccess) {
-      return AsyncValue.error(calendars.errors);
+      return AsyncValue.error(calendars.errors, StackTrace.current);
     } else {
       return AsyncValue.data(calendars.data
           ?.map((c) => SelectableCalendar(

lib/domain/calendar/calendar_syncer.db.dart

@@ -33,7 +33,7 @@ class CalendarSyncer {
       return false;
     }
 
-    final allCalendars = allCalendarsResult.data!.value;
+    final allCalendars = allCalendarsResult.value!;
 
     final now = _dateTimeProvider();
     // 1 day is added since we need to get the start of the next day

lib/domain/timeline/watch_timeline_syncer.dart

@@ -134,7 +134,7 @@ class WatchTimelineSyncer {
       return;
     }
 
-    final plugin = pluginValue.data!.value;
+    final plugin = pluginValue.value!;
 
     const AndroidNotificationDetails androidPlatformChannelSpecifics =
         AndroidNotificationDetails("WARNINGS", "Warnings",

lib/infrastructure/backgroundcomm/BackgroundRpc.dart

@@ -71,10 +71,10 @@ class BackgroundRpc {
       } else if (receivedMessage.errorResult != null) {
         result = AsyncValue.error(
           receivedMessage.errorResult!,
-          stackTrace: receivedMessage.errorStacktrace,
+          receivedMessage.errorStacktrace ?? StackTrace.current,
         );
       } else {
-        result = AsyncValue.error("Received result without any data.");
+        result = AsyncValue.error("Received result without any data.", StackTrace.current);
       }
 
       waitingCompleter.complete(result);

lib/infrastructure/datasources/web_services/auth.dart

@@ -37,6 +37,10 @@ class AuthService extends Service {
     }
   }
 
+  OAuthToken get token {
+    return _token;
+  }
+
   Future<void> signOut() async {
     await _oauth.signOut();
   }

lib/infrastructure/datasources/web_services/rest_client.dart

@@ -28,7 +28,7 @@ class RESTClient {
         ..addAll(params ?? {}),
     );
 
-    HttpClientRequest req = await _client.getUrl(requestUri);
+    HttpClientRequest req = await _client.openUrl(method, requestUri);
     if (token != null) {
       req.headers.add("Authorization", "Bearer $token");
     }
@@ -58,4 +58,4 @@ class RESTClient {
     }
     return _completer.future;
   }
-}
+}

lib/infrastructure/datasources/workarounds.dart

@@ -17,7 +17,7 @@ final neededWorkaroundsProvider = StreamProvider<List<Workaround>>((ref) {
     return Stream<List<Workaround>>.empty();
   }
 
-  final preferences = preferencesData.data!.value;
+  final preferences = preferencesData.value!;
 
   fetchControls() async {
     final workaroundControl = WorkaroundsControl();

lib/main.dart

@@ -6,6 +6,7 @@ import 'package:cobble/infrastructure/datasources/preferences.dart';
 import 'package:cobble/localization/localization.dart';
 import 'package:cobble/localization/localization_delegate.dart';
 import 'package:cobble/localization/model/model_generator.model.dart';
+import 'package:cobble/ui/home/tabs/store_tab.dart';
 import 'package:cobble/ui/splash/splash_page.dart';
 import 'package:cobble/ui/theme/cobble_scheme.dart';
 import 'package:cobble/ui/theme/cobble_theme.dart';
@@ -88,6 +89,9 @@ class MyApp extends HookConsumerWidget {
       child: MaterialApp(
         onGenerateTitle: (context) => tr.common.title,
         theme: CobbleTheme.appTheme(brightness),
+        routes: {
+          '/appstore': (context) => StoreTab(),
+        },
         home: SplashPage(),
         // List all of the app's supported locales here
         supportedLocales: supportedLocales,

lib/ui/devoptions/debug_options_page.dart

@@ -11,11 +11,11 @@ class DebugOptionsPage extends HookConsumerWidget implements CobbleScreen {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final preferences = ref.watch(preferencesProvider);
-    final bootUrl = ref.watch(bootUrlProvider).data?.value ?? "";
+    final bootUrl = ref.watch(bootUrlProvider).value ?? "";
     final shouldOverrideBoot =
-        ref.watch(shouldOverrideBootProvider).data?.value ?? false;
+        ref.watch(shouldOverrideBootProvider).value ?? false;
     final overrideBootUrl =
-        ref.watch(overrideBootValueProvider).data?.value ?? "";
+        ref.watch(overrideBootValueProvider).value ?? "";
 
     final bootUrlController = useTextEditingController();
     final bootOverrideUrlController = useTextEditingController();