2 files changed, 35 insertions, 23 deletions
diff --git a/lib/pages/Apps.dart b/lib/pages/Apps.dart
index 3322c0b..7252aae 100644
--- a/lib/pages/Apps.dart
+++ b/lib/pages/Apps.dart
@@ -1,9 +1,33 @@
 import 'package:flutter/material.dart';
+import 'package:device_apps/device_apps.dart';
+
+import '../components/FixedContainer.dart';
+import '../components/SearchableAppList.dart';
 
 class AppsView extends StatelessWidget {
+  Future<List<Application>> appListF = DeviceApps.getInstalledApplications(
+      includeSystemApps: false,
+      onlyAppsWithLaunchIntent: true,
+  );
+
+  void openApp(Application app) {
+    DeviceApps.openApp(app.packageName);
+  }
+
+  void openOptionsMenu(Application app) {
+    debugPrint('Wow');
+  }
+
   @override
   Widget build(BuildContext ctx) {
-    return Text('Apps');
+    return FixedContainer(
+        padding: const EdgeInsets.symmetric(vertical: 36.0, horizontal: 16.0),
+        child: SearchableAppList(
+            appListF: appListF,
+            openApp: openApp,
+            openOptionsMenu: openOptionsMenu,
+        ),
+    );
   }
 }
 
diff --git a/lib/pages/Home.dart b/lib/pages/Home.dart
index 4d28e29..1f4b473 100644
--- a/lib/pages/Home.dart
+++ b/lib/pages/Home.dart
@@ -2,6 +2,8 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 
+import '../components/FixedContainer.dart';
+
 class StatusInfoCard extends StatelessWidget {
   Stream<DateTime> time$;
   DateTime defaultTime;
@@ -62,28 +64,14 @@ class HomeView extends StatelessWidget {
 
   @override
   Widget build(BuildContext ctx) {
-    return LayoutBuilder(
-        builder: (BuildContext context, BoxConstraints viewportConstraints) {
-          return SingleChildScrollView(
-            child: ConstrainedBox(
-              constraints: BoxConstraints(
-                minHeight: viewportConstraints.maxHeight,
-              ),
-              child: IntrinsicHeight(
-                child: Container(
-                    padding: const EdgeInsets.symmetric(vertical: 36.0, horizontal: 16.0),
-                    height: viewportConstraints.maxHeight,
-                    child: Column(
-                        children: [
-                          StatusInfoCard(time$, defaultTime: defaultTime),
-                          Expanded(child: Text('Content')),
-                        ],
-                    ),
-                )
-              ),
-            ),
-          );
-        }
+    return FixedContainer(
+        padding: const EdgeInsets.symmetric(vertical: 36.0, horizontal: 16.0),
+        child: Column(
+            children: [
+              StatusInfoCard(time$, defaultTime: defaultTime),
+              Expanded(child: Text('Content')),
+            ],
+        )
     );
   }
 }