preparation to v2.1

marchellodev · Apr 21, 2020 · 7c41f5a · 7c41f5a
1 parent 8b746fb
commit 7c41f5a
Show file tree

Hide file tree

Showing 12 changed files with 165 additions and 147 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -24,12 +24,12 @@ if (flutterVersionName == null) {
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
-def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file('key.properties')
-if (keystorePropertiesFile.exists()) {
-    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-}
+//
+//def keystoreProperties = new Properties()
+//def keystorePropertiesFile = rootProject.file('key.properties')
+//if (keystorePropertiesFile.exists()) {
+//    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+//}
 
 android {
     compileSdkVersion 29
@@ -43,25 +43,27 @@ android {
     }
 
     defaultConfig {
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "dev.marchello.sharik"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 4
+        versionCode 5
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    signingConfigs {
-        release {
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-            storePassword keystoreProperties['storePassword']
-        }
-    }
+//    signingConfigs {
+//        release {
+//            keyAlias keystoreProperties['keyAlias']
+//            keyPassword keystoreProperties['keyPassword']
+//            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+//            storePassword keystoreProperties['storePassword']
+//        }
+//    }
     buildTypes {
         release {
-            signingConfig signingConfigs.release
+            signingConfig signingConfigs.debug
+//            signingConfig signingConfigs.release
         }
     }
 }

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,26 +1,24 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="dev.marchello.sharik">
+    package="dev.marchello.sharik">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
-
-    <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.INTERNET" />
 
 
     <application
-            android:name="io.flutter.app.FlutterApplication"
-            android:label="Sharik"
-            android:icon="@mipmap/ic_launcher"
-            android:requestLegacyExternalStorage="true">
+        android:name="io.flutter.app.FlutterApplication"
+        android:label="Sharik"
+        android:icon="@mipmap/ic_launcher">
         <activity
-                android:name=".MainActivity"
-                android:launchMode="singleTop"
-                android:theme="@style/LaunchTheme"
-                android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-                android:hardwareAccelerated="true"
-                android:windowSoftInputMode="adjustResize">
+            android:name=".MainActivity"
+            android:launchMode="singleTop"
+            android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -29,7 +27,7 @@
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
-                android:name="flutterEmbedding"
-                android:value="2"/>
+            android:name="flutterEmbedding"
+            android:value="2" />
     </application>
 </manifest>
diff --git a/android/settings_aar.gradle b/android/settings_aar.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/build.sh b/build.sh
@@ -1,6 +1,7 @@
 start_time=$(date +%s)
 
 flutter packages pub run build_runner build
+#dpkg-buildpackage -b --force-sign
 
 flutter channel stable
 flutter upgrade

diff --git a/go/go.mod b/go/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/go-flutter-desktop/plugins/package_info v0.0.0-20200415181852-215d9c007301
 	github.com/go-flutter-desktop/plugins/path_provider v0.4.0
 	github.com/go-flutter-desktop/plugins/url_launcher v0.1.2
-	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200419152627-bf0707bfd6c6 // indirect
+	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200420212212-258d9bec320e // indirect
 	github.com/marchellodev/flutter_file_picker/go v0.0.0-20200418122400-aa65f28dd31a
 	github.com/marchellodev/go_flutter_clipboard_manager v0.0.0-20200307200206-e6c577512b18
 	github.com/miguelpruivo/flutter_file_picker/go v0.0.0-20200418131136-0a6be57b4ba8

diff --git a/go/go.sum b/go/go.sum
@@ -32,6 +32,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200419104939-9b86c984c866 h1:4zUt7n3i+F
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200419104939-9b86c984c866/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200419152627-bf0707bfd6c6 h1:0Dm9nbKM4Lrer6uugJPNuSfruJ4FWaK2A9nQv1mQOto=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200419152627-bf0707bfd6c6/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200420212212-258d9bec320e h1:8ywu4ELC/6owgOZlZx75CyYS5AYwUT2L+hzPModKvag=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200420212212-258d9bec320e/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/gopherjs/gopherjs v0.0.0-20190915194858-d3ddacdb130f/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=

diff --git a/lib/locales/pl.dart b/lib/locales/pl.dart
@@ -39,7 +39,7 @@ Map<String, String> get getPl => {
       'Updates': 'Aktualizacje',
       'The latest version is already installed':
           'Najnowsza wersja już zainstalowana',
-      'Current version': 'Поточна верія',
-      'The latest version': 'Остання версія',
-      'Changelog': 'Зміни',
+      'Current version': 'Obecna wersja',
+      'The latest version': 'Najnowsza wersja',
+      'Changelog': 'Dziennik zmian',
     };
diff --git a/lib/locales/ru.dart b/lib/locales/ru.dart
@@ -39,7 +39,7 @@ Map<String, String> get getRu => {
       'Updates': 'Обновления',
       'The latest version is already installed':
           'Последняя версия уже установлена',
-      'Current version': 'Aktualna wersja',
-      'The latest version': 'Najnowsza wersja',
-      'Changelog': 'Zmiany',
+      'Current version': 'Текущая версия',
+      'The latest version': 'Последняя версия',
+      'Changelog': 'Изменения',
     };
diff --git a/lib/main.dart b/lib/main.dart
@@ -30,6 +30,7 @@ void main() async {
     await Hive.openBox('app2');
 
     runApp(MaterialApp(
+      debugShowCheckedModeBanner: false,
       home: Scaffold(
         resizeToAvoidBottomPadding: false,
         backgroundColor: Colors.white,

diff --git a/lib/pages/app_selector.dart b/lib/pages/app_selector.dart
@@ -49,59 +49,65 @@ class _AppSelectorState extends State<AppSelector> {
     }
 
     return AlertDialog(
-      scrollable: true,
-      content: Column(
-        children: <Widget>[
-          CheckboxListTile(
-            title: Text(L('Hide system apps', widget.adapter)),
-            value: _checkSystem,
-            onChanged: (value) => setState(() {
-              _checkSystem = value;
-              getApps();
-            }),
-            controlAffinity: ListTileControlAffinity.leading,
-          ),
-          CheckboxListTile(
-            title: Text(L('Hide non-launchable apps', widget.adapter)),
-            value: _checkLaunch,
-            onChanged: (value) => setState(() {
-              _checkLaunch = value;
-              getApps();
-            }),
-            controlAffinity: ListTileControlAffinity.leading,
-          ),
-          TextField(
-            onChanged: (value) => setState(() => _search = value),
-            decoration: InputDecoration(hintText: L('Search', widget.adapter)),
-          ),
-          _apps != null
-              ? Column(
-                  children: _apps
-                      .map((e) {
-                        ApplicationWithIcon app = e;
-                        return ListTile(
-                          leading: Image.memory(app.icon),
-                          title: SingleChildScrollView(
-                              scrollDirection: Axis.horizontal,
-                              child: Text(app.appName)),
-                          subtitle: SingleChildScrollView(
-                              scrollDirection: Axis.horizontal,
-                              child: Text(
-                                app.packageName,
-                              )),
-                          onTap: () =>
-                              setState(() => _selected = app.packageName),
-                          selected: _selected == app.packageName,
-                        );
-                      })
-                      .toList()
-                      .cast<Widget>(),
-                )
-              : Center(
-                  child: Container(
-                      padding: EdgeInsets.all(24),
-                      child: CircularProgressIndicator()))
-        ],
+//      scrollable: true,
+      content: Container(
+        height: double.maxFinite,
+        width: double.maxFinite,
+        child: ListView(
+          shrinkWrap: true,
+          children: <Widget>[
+            CheckboxListTile(
+              title: Text(L('Hide system apps', widget.adapter)),
+              value: _checkSystem,
+              onChanged: (value) => setState(() {
+                _checkSystem = value;
+                getApps();
+              }),
+              controlAffinity: ListTileControlAffinity.leading,
+            ),
+            CheckboxListTile(
+              title: Text(L('Hide non-launchable apps', widget.adapter)),
+              value: _checkLaunch,
+              onChanged: (value) => setState(() {
+                _checkLaunch = value;
+                getApps();
+              }),
+              controlAffinity: ListTileControlAffinity.leading,
+            ),
+            TextField(
+              onChanged: (value) => setState(() => _search = value),
+              decoration:
+                  InputDecoration(hintText: L('Search', widget.adapter)),
+            ),
+            _apps != null
+                ? Column(
+                    children: _apps
+                        .map((e) {
+                          ApplicationWithIcon app = e;
+                          return ListTile(
+                            leading: Image.memory(app.icon),
+                            title: SingleChildScrollView(
+                                scrollDirection: Axis.horizontal,
+                                child: Text(app.appName)),
+                            subtitle: SingleChildScrollView(
+                                scrollDirection: Axis.horizontal,
+                                child: Text(
+                                  app.packageName,
+                                )),
+                            onTap: () =>
+                                setState(() => _selected = app.packageName),
+                            selected: _selected == app.packageName,
+                          );
+                        })
+                        .toList()
+                        .cast<Widget>(),
+                  )
+                : Center(
+                    child: Container(
+                        padding: EdgeInsets.all(24),
+                        child: CircularProgressIndicator()))
+          ],
+        ),
       ),
       actions: <Widget>[
         FlatButton(