general tidy

maxisme · May 3, 2021 · 823357b · 823357b
1 parent 6ad65f3
commit 823357b
Show file tree

Hide file tree

Showing 24 changed files with 50 additions and 72 deletions.
diff --git a/.github/workflows/scripts/notarize.sh b/.github/workflows/scripts/notarize.sh
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -24,6 +24,8 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>FirebaseAppDelegateProxyEnabled</key>
+	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppleMusicUsageDescription</key>
@@ -51,7 +53,6 @@
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>fetch</string>
-		<string>processing</string>
 		<string>remote-notification</string>
 	</array>
 	<key>UILaunchStoryboardName</key>

diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile
@@ -20,7 +20,6 @@ cocoapods(
 platform :ios do
   desc "Upload build to test flight"
   lane :tfdeploy do
-
     create_keychain(
         name: "kc",
         password: "p4ssword",
@@ -52,18 +51,31 @@ platform :ios do
 
   desc "Upload build to app store"
   lane :asdeploy do
+    create_keychain(
+        name: "kc",
+        password: "p4ssword",
+        default_keychain: false,
+        unlock: true,
+        timeout: 3600,
+        lock_when_sleeps: false
+    )
 
     app_store_connect_api_key(
         key_id: "MK4628AYTK",
         issuer_id: "69a6de80-d5bc-47e3-e053-5b8c7c11a4d1",
         key_filepath: "../AuthKey_MK4628AYTK.p8",
-        duration: 1200,
+        duration: 1200
     )
 
-    match("appstore")
+    match(type: "development", readonly: true, keychain_name: "kc", keychain_password: "p4ssword")
+    match(type: "appstore", readonly: true, keychain_name: "kc", keychain_password: "p4ssword")
 
-    build_ios_app(
-        export_method: "app-store"
+    build_app(
+      workspace: "Runner.xcworkspace",
+      export_method: "app-store",
+      xcargs: {
+        PROVISIONING_PROFILE_SPECIFIER: ENV["sigh_it.notifi.notifi_appstore"]
+      }
     )
 
     upload_to_app_store

diff --git a/lib/notifications/notification.dart b/lib/notifications/notification.dart
@@ -126,20 +126,23 @@ class NotificationUIState extends State<NotificationUI> {
             fontSize: 10,
             letterSpacing: 0.2,
             height: 1.4);
-        messageRow = Row(key: _messageKey, children: <Widget>[
-          Flexible(
-              child: SelectableText(widget.message, onTap: () {
-            setState(() {
-              if (!widget.isExpanded) {
-                widget.toggleExpand(widget.index);
-              }
-            });
-          },
-                  scrollPhysics: const NeverScrollableScrollPhysics(),
-                  style: messageStyle,
-                  minLines: 1,
-                  maxLines: messageMaxLines)),
-        ]);
+        messageRow = Container(
+          padding: const EdgeInsets.only(top: 3),
+          child: Row(key: _messageKey, children: <Widget>[
+            Flexible(
+                child: SelectableText(widget.message, onTap: () {
+              setState(() {
+                if (!widget.isExpanded) {
+                  widget.toggleExpand(widget.index);
+                }
+              });
+            },
+                    scrollPhysics: const NeverScrollableScrollPhysics(),
+                    style: messageStyle,
+                    minLines: 1,
+                    maxLines: messageMaxLines)),
+          ]),
+        );
       } else {
         messageRow = const SizedBox();
       }
@@ -322,7 +325,7 @@ class NotificationUIState extends State<NotificationUI> {
 
   void _canExpandHandler(BuildContext context) {
     bool canExpand = false;
-    // for title
+
     if (_columnKey.currentContext != null &&
         hasTextOverflow(widget.title, titleStyle,
             maxWidth: _columnKey.currentContext.size.width)) {

diff --git a/lib/notifications/notifications_table.dart b/lib/notifications/notifications_table.dart
@@ -35,6 +35,8 @@ class NotificationTableState extends State<NotificationTable>
         return Scrollbar(
           thickness: 4,
           child: AnimatedList(
+              padding: const EdgeInsets.only(bottom: 10),
+              shrinkWrap: true,
               key: notifications.tableKey,
               controller: notifications.tableController,
               itemBuilder: _buildNotification,
@@ -153,7 +155,7 @@ class NotificationTableState extends State<NotificationTable>
           child: Slidable(
               key: Key(notification.id.toString()),
               actionPane: const SlidableDrawerActionPane(),
-              actionExtentRatio: 0.2,
+              actionExtentRatio: 0.15,
               actions: <Widget>[
                 IconSlideAction(
                   color: MyColour.offWhite,

diff --git a/lib/notifications/notifis.dart b/lib/notifications/notifis.dart
@@ -103,7 +103,7 @@ class Notifications extends ChangeNotifier {
           (BuildContext context, Animation<double> animation) {
         final Animation<Offset> _offsetAnimation = Tween<Offset>(
           begin: const Offset(0, 0.0),
-          end: const Offset(-0.8, 0),
+          end: const Offset(1, 0),
         ).animate(ReverseAnimation(animation));
 
         return SlideTransition(

diff --git a/test-notifications.sh b/test-notifications.sh
@@ -8,25 +8,15 @@ LOREM="Lorem%20ipsum%20dolor%20sit%20amet,%20consectetur%20adipiscing%20elit.%20
 
 #curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=${LOREM}&message=${LOREM}"
 #curl -i "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=$(date +%s)&message=${LOREM}"
-curl -i "http://127.0.0.1:9081/api?credentials=${CREDENTIALS}&title=$(date +%s)&message=${LOREM}"
+#curl -i "http://127.0.0.1:9081/api?credentials=${CREDENTIALS}&title=$(date +%s)&message=${LOREM}"
 #curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=hey&message=${LOREM}"
 #curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=hey&message=hey"
 #curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=1"
-curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=${LOREM}&image=https://notifi.it/images/logo.png"
-curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=hi&message=hi&image=https://notifi.it/images/logo.png"
-curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=${LOREM}&message=${LOREM}&image=https://notifi.it/images/logo.png"
-curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=hi&image=https://notifi.it/images/logo.png"
-curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=hey&link=https://google.com"
-curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=${LOREM}&link=https://google.com"
-curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=hi&message=hi&image=https://notifi.it/images/logo.png"
-curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=hi&image=https://notifi.it/images/logo.png"
-curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=${LOREM}&message=${LOREM}&image=https://notifi.it/images/logo.png"
-curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=${LOREM}&image=https://notifi.it/images/logo.png"
-curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=${LOREM}&message=hi&image=https://notifi.it/images/logo.png&link=https://google.com"
-curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=${LOREM}&message=${LOREM}&link=https://google.com"
-curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=${LOREM}&message=${LOREM}&link=https://google.com"
-
-#for i in {1..3}
-#do
-#    curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=$i%20${LOREM}&message=$i%20${LOREM}&link=https://google.com"
-#done
+curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=Hacker%20News:%20%20Machine%20Learning%20101%20slidedeck:%202%20years%20of%20headbanging,%20so%20you%20don't%20have%20to%20&link=https://news.ycombinator.com/"s
+curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=BTC%20@%20£50,000"
+curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=Server%20Login&message=IP:%2035.177.218.15%20(London)"
+curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=RTX%20back%20in%20stock&message=£719.99&link=https://www.currys.co.uk/"
+curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=Daily%20Image%20Inspiration&message=Abandoned%20car%20park&image=https://i.imgur.com/n0GhyPT.png"
+curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=Sensor%20Alert!%20&message=Activity%20By%20The%20Front%20🚪"
+curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=Hacker%20News:%20The%20Unix%20Magic%20poster&message=I%20understand%20the%20classic%20UNIX%20Magic%20poster%20by%20Gary%20Overacre%20was%20distributed%20at%20past%20USENIX%20conferences,%20and%20I’ve%20known%20of%20it%20for%20years%20but%20now%20in%20confinement,%20I’ve%20decided%20I%20want%20one%20to%20hang%20in%20my%20office.&link=https://news.ycombinator.com/"
+curl "https:/dev.notifi.it/api?credentials=${CREDENTIALS}&title=Backup%20Finished&message=Took%20512%20seconds"
diff --git a/test/golden-asserts/notification/is_expanded.png b/test/golden-asserts/notification/is_expanded.png
diff --git a/test/golden-asserts/notification/title_0-message_1-links_0-images_0.png b/test/golden-asserts/notification/title_0-message_1-links_0-images_0.png
diff --git a/test/golden-asserts/notification/title_0-message_1-links_0-images_1.png b/test/golden-asserts/notification/title_0-message_1-links_0-images_1.png
diff --git a/test/golden-asserts/notification/title_0-message_1-links_1-images_0.png b/test/golden-asserts/notification/title_0-message_1-links_1-images_0.png
diff --git a/test/golden-asserts/notification/title_0-message_1-links_1-images_1.png b/test/golden-asserts/notification/title_0-message_1-links_1-images_1.png
diff --git a/test/golden-asserts/notification/title_0-message_2-links_0-images_0.png b/test/golden-asserts/notification/title_0-message_2-links_0-images_0.png
diff --git a/test/golden-asserts/notification/title_0-message_2-links_0-images_1.png b/test/golden-asserts/notification/title_0-message_2-links_0-images_1.png
diff --git a/test/golden-asserts/notification/title_0-message_2-links_1-images_0.png b/test/golden-asserts/notification/title_0-message_2-links_1-images_0.png
diff --git a/test/golden-asserts/notification/title_0-message_2-links_1-images_1.png b/test/golden-asserts/notification/title_0-message_2-links_1-images_1.png
diff --git a/test/golden-asserts/notification/title_1-message_1-links_0-images_0.png b/test/golden-asserts/notification/title_1-message_1-links_0-images_0.png
diff --git a/test/golden-asserts/notification/title_1-message_1-links_0-images_1.png b/test/golden-asserts/notification/title_1-message_1-links_0-images_1.png
diff --git a/test/golden-asserts/notification/title_1-message_1-links_1-images_0.png b/test/golden-asserts/notification/title_1-message_1-links_1-images_0.png
diff --git a/test/golden-asserts/notification/title_1-message_1-links_1-images_1.png b/test/golden-asserts/notification/title_1-message_1-links_1-images_1.png
diff --git a/test/golden-asserts/notification/title_1-message_2-links_0-images_0.png b/test/golden-asserts/notification/title_1-message_2-links_0-images_0.png
diff --git a/test/golden-asserts/notification/title_1-message_2-links_0-images_1.png b/test/golden-asserts/notification/title_1-message_2-links_0-images_1.png
diff --git a/test/golden-asserts/notification/title_1-message_2-links_1-images_0.png b/test/golden-asserts/notification/title_1-message_2-links_1-images_0.png
diff --git a/test/golden-asserts/notification/title_1-message_2-links_1-images_1.png b/test/golden-asserts/notification/title_1-message_2-links_1-images_1.png