413-smartphone-as-a-container

.github/workflows/flutter_build.yml

@@ -16,21 +16,23 @@ jobs:
       # matrix job fails.
       fail-fast: false
       matrix:
-        api-level: [21,31] # [minSdk, most used, newest (30 is not working :(] 19 would be minSDK but does not support x86_64
+        api-level: [21,31,34] # [minSdk, most used, newest (30 is not working :(] 19 would be minSDK but does not support x86_64
         target: [default] # [default, google_apis]
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-java@v2
       with:
         distribution: 'zulu'
-        java-version: '11'
+        java-version: '17.0.11'
     - uses: subosito/flutter-action@v2
       with:
         channel: 'stable'
         flutter-version: '3.24.3'
-    - run: "flutter --version"
-    - run: "flutter pub get"
-    - run: "flutter build ios -t 'lib/mains/main_netknights.dart' --debug --flavor netknights --no-codesign"
+    - run: 'flutter --version'
+    - run: 'flutter doctor -v'
+    - run: 'flutter pub get'
+    - run: 'flutter gen-l10n'
+    - run: 'flutter build ios -t "lib/mains/main_netknights.dart" --debug --flavor netknights --no-codesign'
 
   build_appbundle:
     name: (Android)
@@ -47,13 +49,15 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'oracle'
-          java-version: '17'
+          distribution: 'zulu'
+          java-version: '17.0.11'
       - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
           flutter-version: '3.24.3'
       - run: 'flutter clean'
-      - run: "flutter --version"
-      - run: "flutter pub get"
-      - run: "flutter build apk -t 'lib/mains/main_netknights.dart' --debug --flavor netknights"
+      - run: 'flutter --version'
+      - run: 'flutter doctor -v'
+      - run: 'flutter pub get'
+      - run: 'flutter gen-l10n'
+      - run: 'flutter build apk -t "lib/mains/main_netknights.dart" --debug --flavor netknights'

.github/workflows/flutter_test.yml

@@ -15,12 +15,13 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '17.0.7'
+          java-version: '17.0.11'
       - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
           flutter-version: '3.24.3'
-      - run: "flutter --version"
-      - run: flutter pub get
-      - run: flutter gen-l10n
-      - run: flutter test
+      - run: 'flutter --version'
+      - run: 'flutter doctor -v'
+      - run: 'flutter pub get'
+      - run: 'flutter gen-l10n'
+      - run: 'flutter test'

.gitignore

@@ -896,3 +896,4 @@ ios/Flutter/flutter_export_environment.sh
 *firebase_options.dart
 !default_firebase_options.dart
 firebase.json
+lib/l10n/app_localizations*

analysis_options.yaml

@@ -1,3 +1,6 @@
+analyzer:
+  errors:
+    constant_identifier_names: ignore
 include: package:flutter_lints/flutter.yaml
 
 linter:

android/app/build.gradle

@@ -7,6 +7,13 @@ plugins {
     id "dev.flutter.flutter-gradle-plugin"
 }
 
+
+
+dependencies {
+    // Add this [coreLibraryDesugaring] inside [dependencies]
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'// use compatible version e.g 2.1.4
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -40,17 +47,24 @@ if (keystorePropertiesFileNetknightsDebug.exists()) {
 
 
 android {
-    compileSdkVersion 34
+    namespace 'it.netknights.piauthenticator'
+
+    compileSdkVersion 35
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+    }
 
     defaultConfig {
         applicationId "it.netknights.piauthenticator"
-        minSdkVersion 21    
-        targetSdkVersion 34
+        minSdkVersion 21
+        targetSdkVersion 35
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         manifestPlaceholders = [applicationName: "io.flutter.app.FlutterApplication"]
@@ -62,7 +76,7 @@ android {
             storePassword keystorePropertiesNetknights['storePassword']
             keyAlias keystorePropertiesNetknights['keyAlias']
             keyPassword keystorePropertiesNetknights['keyPassword']
-        }        
+        }
         netknights_debug {
             storeFile keystorePropertiesNetknightsDebug['storeFile'] ? file(keystorePropertiesNetknightsDebug['storeFile']) : null
             storePassword keystorePropertiesNetknightsDebug['storePassword']
@@ -72,7 +86,7 @@ android {
     }
 
     flavorDimensions "pi-authenticator"
-    
+
     productFlavors {
         netknights{
             dimension "pi-authenticator"
@@ -87,7 +101,7 @@ android {
             signingConfig signingConfigs.netknights_debug
         }
     }
-   
+
     buildTypes {
         release {
             // Enables code shrinking, obfuscation, and optimization for only

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="it.netknights.piauthenticator">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
@@ -11,12 +10,12 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <!-- To read all files until API level 32 -->
     <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE" 
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
 
     <!-- To write all files until API level 29. We will MediaStore from API level 30 -->
     <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE" 
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="28" />
 
 
@@ -63,7 +62,7 @@
             <!-- <meta-data
                     android:name="io.flutter.embedding.android.SplashScreenDrawable"
                     android:resource="@drawable/launch_background" /> -->
-                    
+
             <!-- This is used for the home screen widget -->
             <intent-filter>
                 <action android:name="es.antonborri.home_widget.action.LAUNCH" />
@@ -93,7 +92,7 @@
             android:name="es.antonborri.home_widget.HomeWidgetBackgroundService"
             android:permission="android.permission.BIND_JOB_SERVICE"
             android:exported="true"/>
-           
+
 
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
@@ -108,4 +107,3 @@
       </intent>
     </queries>
 </manifest>
-

android/app/src/netknights/kotlin/it/netknights/piauthenticator/WidgetProvider.kt

@@ -32,7 +32,7 @@ class AppWidgetProvider : HomeWidgetProvider() {
             nightModeSuffix = if(currentThemeMode == "dark") "_dark" else "_light"
         }
         println("nightModeSuffix: $nightModeSuffix")
-        
+
         var editor = widgetData.edit()
         editor.putString("_widgetIds", appWidgetIds.joinToString(","))
         widgetData.getString("_copyText", null)?.let {
@@ -46,7 +46,7 @@ class AppWidgetProvider : HomeWidgetProvider() {
         editor.remove("_rebuildingWidgetIds")
         var rebuildingWidgetIds: IntArray
         if(rebuildingIds == null || rebuildingIds.isEmpty()) {
-            rebuildingWidgetIds = appWidgetIds   
+            rebuildingWidgetIds = appWidgetIds
         } else {
             rebuildingWidgetIds = rebuildingIds?.split(",")?.map { it.toInt() }?.toIntArray() ?: intArrayOf()
         }
@@ -55,7 +55,7 @@ class AppWidgetProvider : HomeWidgetProvider() {
         rebuildingWidgetIds.forEach { widgetId ->
             val views = RemoteViews(context.packageName, R.layout.widget_layout).apply {
                 val tokenId = widgetData.getString("_tokenId$widgetId", null)
-                
+
                 // _loadImageFromWidgetDataString(widgetData, "_tokenBackground$nightModeSuffix", R.id.widget_background, this)
                 _setBackground(context, widgetData, widgetId, nightModeSuffix, this)
                 if(tokenId == null) {
@@ -93,10 +93,12 @@ class AppWidgetProvider : HomeWidgetProvider() {
     }
     fun _setSettingsIcon(context: Context, widgetData: SharedPreferences, widgetId: Int, nightModeSuffix: String, remoteViews: RemoteViews) {
         _loadImageFromWidgetDataString(widgetData, "_settingsIcon$nightModeSuffix", R.id.widget_settings, remoteViews)
-        val pendingIntent = HomeWidgetLaunchIntent.getActivity(context,
+        val pendingIntent = HomeWidgetLaunchIntent.getActivity(
+            context,
             MainActivity::class.java,
-            Uri.parse("homewidgetnavigate://link?id=$widgetId"))
-        remoteViews.setOnClickPendingIntent(R.id.widget_settings, pendingIntent) 
+            Uri.parse("homewidgetnavigate://link?id=$widgetId")
+        )
+        remoteViews.setOnClickPendingIntent(R.id.widget_settings, pendingIntent)
     }
     fun _setActionIcon(context: Context, widgetData: SharedPreferences, widgetId: Int, nightModeSuffix: String, remoteViews: RemoteViews, showToken: Boolean) {
         println("getString: _tokenType$widgetId")
@@ -120,21 +122,27 @@ class AppWidgetProvider : HomeWidgetProvider() {
         _loadImageFromWidgetDataString(widgetData, "_tokenOtp${widgetId}_hidden$nightModeSuffix", R.id.widget_otp, remoteViews)
         println("tokenLocked: $tokenLocked")
         if(tokenLocked) {
-            val pendingIntent = HomeWidgetLaunchIntent.getActivity(context,
+            val pendingIntent = HomeWidgetLaunchIntent.getActivity(
+                context,
                 MainActivity::class.java,
-                Uri.parse("homewidgetnavigate://showlocked?id=$widgetId"))
+                Uri.parse("homewidgetnavigate://showlocked?id=$widgetId")
+            )
             remoteViews.setOnClickPendingIntent(R.id.widget_otp, pendingIntent)
         } else {
-        val backgroundIntent = HomeWidgetBackgroundIntent.getBroadcast(context,
-            Uri.parse("homewidget://show?widgetId=$widgetId"))
+        val backgroundIntent = HomeWidgetBackgroundIntent.getBroadcast(
+            context,
+            Uri.parse("homewidget://show?widgetId=$widgetId")
+        )
         remoteViews.setOnClickPendingIntent(R.id.widget_otp, backgroundIntent)}
     }
 
     fun _setTokenOtp(context: Context, widgetData: SharedPreferences, widgetId: Int, nightModeSuffix: String, remoteViews: RemoteViews) {
         _loadImageFromWidgetDataString(widgetData, "_tokenOtp$widgetId$nightModeSuffix", R.id.widget_otp, remoteViews)
         // Otp is visible, so the user can copy it to the clipboard with the next click
-        val clipIntent = HomeWidgetBackgroundIntent.getBroadcast(context,
-            Uri.parse("homewidget://copy?widgetId=$widgetId"))
+        val clipIntent = HomeWidgetBackgroundIntent.getBroadcast(
+            context,
+            Uri.parse("homewidget://copy?widgetId=$widgetId")
+        )
         remoteViews.setOnClickPendingIntent(R.id.widget_otp, clipIntent)
     }
 
@@ -145,35 +153,38 @@ class AppWidgetProvider : HomeWidgetProvider() {
     }
 
     fun _setContainerEmpty(context: Context, widgetData: SharedPreferences, widgetId: Int, nightModeSuffix: String, remoteViews: RemoteViews) {
+        // No token yet, so the user has to select one
+        val pendingIntent = HomeWidgetLaunchIntent.getActivity(
+            context,
+            MainActivity::class.java,
+            Uri.parse("homewidgetnavigate://link?id=$widgetId")
+        )
+        remoteViews.setOnClickPendingIntent(R.id.widget_background, pendingIntent)
+        remoteViews.setOnClickPendingIntent(R.id.widget_otp, pendingIntent)
         _loadImageFromWidgetDataString(widgetData, "_tokenContainerEmpty$nightModeSuffix", R.id.widget_otp, remoteViews)
         remoteViews.setImageViewBitmap(R.id.widget_settings, null);
         remoteViews.setImageViewBitmap(R.id.widget_action, null);
-        // No token yet, so the user has to select one
-        val pendingIntent = HomeWidgetLaunchIntent.getActivity(context,
-                MainActivity::class.java,
-                Uri.parse("homewidgetnavigate://link?id=$widgetId"))
-        remoteViews.setOnClickPendingIntent(R.id.widget_background, pendingIntent)
     }
 
 
 
     fun _loadImageFromWidgetDataString(widgetData: SharedPreferences, key: String, xmlElement: Int, view: RemoteViews): Boolean {
-        
+
         println("Try to load image from key: $key")
         val imagePath = widgetData.getString("$key", null)
         if(imagePath == null) {
             println("imagePath is null")
             view.setImageViewBitmap(xmlElement, null)
             return false
-        } 
-        
+        }
+
         val imageFile = File(imagePath)
         val imageExists = imageFile.exists()
         if (imageExists && imageFile.absolutePath == null) {
             println("image not found!, looked @: $imagePath")
             return false
         }
-       
+
         println("imagePath is $imagePath")
         try {
             val myBitmap: Bitmap = BitmapFactory.decodeFile(imageFile.absolutePath)

android/app/src/netknights/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
   <background android:drawable="@color/ic_launcher_background"/>
-  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <foreground>
+      <inset
+          android:drawable="@drawable/ic_launcher_foreground"
+          android:inset="16%" />
+  </foreground>
+  <monochrome>
+      <inset
+          android:drawable="@drawable/ic_launcher_monochrome"
+          android:inset="16%" />
+  </monochrome>
 </adaptive-icon>