Renamed methods,

added setBool and fixed other bugs
Uploadgram · Sep 2, 2020 · 755f2ef · 755f2ef
1 parent 2dda641
commit 755f2ef
Show file tree

Hide file tree

Showing 7 changed files with 208 additions and 142 deletions.
diff --git a/android/app/src/main/java/com/pato05/uploadgram/MainActivity.java b/android/app/src/main/java/com/pato05/uploadgram/MainActivity.java
@@ -55,6 +55,12 @@ public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
                         default:
                             result.notImplemented();
                             break;
+                        case "setBool":
+                            result.success(_sharedPrefs.edit().putBoolean(call.argument("name"), call.argument("value")).commit());
+                            break;
+                        case "getBool":
+                            result.success(_sharedPrefs.getBoolean(call.argument("name"), false));
+                            break;
                     }
                 });
     }

diff --git a/lib/androidApiWrapper.dart b/lib/androidApiWrapper.dart
@@ -33,10 +33,10 @@ class APIWrapper {
 
   Future<bool> saveFiles(Map files) {
     print('called api.saveFiles($files)');
-    return saveString('uploaded_files', json.encode(files));
+    return setString('uploaded_files', json.encode(files));
   }
 
-  Future<bool> saveString(String name, String content) =>
+  Future<bool> setString(String name, String content) =>
       _methodChannel.invokeMethod(
           'saveString', <String, String>{'name': name, 'content': content});
 
@@ -47,6 +47,12 @@ class APIWrapper {
       _methodChannel.invokeMethod(
           'getString', <String, String>{'name': name, 'default': defaultValue});
 
+  Future<bool> getBool(String name) =>
+      _methodChannel.invokeMethod('getBool', <String, String>{'name': name});
+
+  Future<bool> setBool(String name, bool value) => _methodChannel
+      .invokeMethod('setBool', <String, dynamic>{'name': name, 'value': value});
+
   Future<Map> getFile() async {
     String filePath = await _methodChannel.invokeMethod('getFile');
     print(filePath);
@@ -90,7 +96,7 @@ class APIWrapper {
 
     String fileName = file['name'];
     int fileSize = file['size'];
-    MediaType mime = mimeTypes[fileName.split('.').last] ??
+    MediaType mime = mimeTypes[fileName.split('.').last.toLowerCase()] ??
         MediaType('application', 'octet-stream');
     print(mime);
     print('processing file upload');

diff --git a/lib/apiWrapperStub.dart b/lib/apiWrapperStub.dart
@@ -14,11 +14,14 @@ class APIWrapper {
       throw UnsupportedError('');
   Future<bool> saveFiles(Map files) => throw UnsupportedError('');
   Future<Map> getFiles() => throw UnsupportedError('');
-  Future<bool> saveString(String name, String content) =>
+  Future<bool> setString(String name, String content) =>
       throw UnsupportedError('');
-  Future<String> getString(String name, String defaultValue) async =>
+  Future<String> getString(String name, String defaultValue) =>
       throw UnsupportedError('');
 
+  Future<bool> getBool(String name) => throw UnsupportedError('');
+  Future<bool> setBool(String name, bool content) => throw UnsupportedError('');
+
   Future<Map> uploadFile(
     Map file, {
     Function(int, int) onProgress,

diff --git a/lib/appSettings.dart b/lib/appSettings.dart
@@ -3,7 +3,7 @@ import 'apiWrapperStub.dart'
     if (dart.library.html) 'webApiWrapper.dart';
 
 class AppSettings {
-  static Map files;
+  static Map<String, Map> files;
   static APIWrapper api = APIWrapper();
   static String filesTheme = 'new';
   static String fabTheme = 'extended';
@@ -20,7 +20,7 @@ class AppSettings {
 
   static Future<Map<String, dynamic>> getFiles() async {
     if (files == null) {
-      files = await api.getFiles();
+      files = (await api.getFiles()).cast<String, Map>();
     }
     return files;
   }
@@ -31,7 +31,7 @@ class AppSettings {
   }
 
   static Future<bool> saveSettings() async {
-    return await api.saveString('fabTheme', fabTheme) &&
-        await api.saveString('filesTheme', filesTheme);
+    return await api.setString('fabTheme', fabTheme) &&
+        await api.setString('filesTheme', filesTheme);
   }
 }
diff --git a/lib/fileInfo.dart b/lib/fileInfo.dart
@@ -77,57 +77,63 @@ class _FileInfoRouteState extends State<FileInfoRoute> {
             )
           ],
         ),
-        body: Padding(
-            padding: EdgeInsets.symmetric(horizontal: 15, vertical: 50),
-            child: ListView(children: [
-              ConstrainedBox(
-                constraints: BoxConstraints(maxHeight: 170),
-                child: Center(
-                    child: Icon(widget.fileIcon,
-                        size: 56, color: Colors.grey.shade700)),
-              ),
-              Padding(
-                  child: Text(
-                    widget.filename,
-                    style: TextStyle(fontSize: 26, fontWeight: FontWeight.w500),
-                    overflow: TextOverflow.visible,
-                  ),
-                  padding: EdgeInsets.symmetric(vertical: 23)),
-              Table(
-                columnWidths: {
-                  0: const FlexColumnWidth(0.3),
-                  2: const FlexColumnWidth(0.7),
-                },
-                children: [
-                  [
-                    Text('Size', style: TextStyle(fontSize: fontSize)),
-                    Text(humanSize(widget.fileSize),
-                        style: TextStyle(fontSize: fontSize))
-                  ],
-                  [
-                    Text('URL', style: TextStyle(fontSize: fontSize)),
-                    SelectableText(widget.url,
-                        style: TextStyle(fontSize: fontSize))
-                  ],
-                  [
-                    Text('Uploaded on', style: TextStyle(fontSize: fontSize)),
-                    Text(
-                      uploadDateFormatted,
-                      style: TextStyle(fontSize: fontSize),
-                    )
+        body: ListView(children: [
+          Padding(
+              padding: EdgeInsets.symmetric(horizontal: 15, vertical: 50),
+              child: Column(mainAxisSize: MainAxisSize.max, children: [
+                ConstrainedBox(
+                  constraints: BoxConstraints(maxHeight: 170),
+                  child: Center(
+                      child: Icon(widget.fileIcon,
+                          size: 56, color: Colors.grey.shade700)),
+                ),
+                Row(children: [
+                  Padding(
+                      child: Text(
+                        widget.filename,
+                        style: TextStyle(
+                            fontSize: 26, fontWeight: FontWeight.w500),
+                        overflow: TextOverflow.visible,
+                        textAlign: TextAlign.start,
+                      ),
+                      padding: EdgeInsets.symmetric(vertical: 23))
+                ]),
+                Table(
+                  columnWidths: {
+                    0: const FlexColumnWidth(0.3),
+                    2: const FlexColumnWidth(0.7),
+                  },
+                  children: [
+                    [
+                      Text('Size', style: TextStyle(fontSize: fontSize)),
+                      Text(humanSize(widget.fileSize),
+                          style: TextStyle(fontSize: fontSize))
+                    ],
+                    [
+                      Text('URL', style: TextStyle(fontSize: fontSize)),
+                      SelectableText(widget.url,
+                          style: TextStyle(fontSize: fontSize))
+                    ],
+                    [
+                      Text('Uploaded on', style: TextStyle(fontSize: fontSize)),
+                      Text(
+                        uploadDateFormatted,
+                        style: TextStyle(fontSize: fontSize),
+                      )
+                    ]
                   ]
-                ]
-                    .map((e) => TableRow(
-                        children: e
-                            .map((wid) => TableCell(
-                                verticalAlignment:
-                                    TableCellVerticalAlignment.middle,
-                                child: Container(
-                                    child: wid,
-                                    margin: EdgeInsets.only(bottom: 30))))
-                            .toList()))
-                    .toList(),
-              ),
-            ])));
+                      .map((e) => TableRow(
+                          children: e
+                              .map((wid) => TableCell(
+                                  verticalAlignment:
+                                      TableCellVerticalAlignment.middle,
+                                  child: Container(
+                                      child: wid,
+                                      margin: EdgeInsets.only(bottom: 30))))
+                              .toList()))
+                      .toList(),
+                ),
+              ]))
+        ]));
   }
 }