Skip to content

Commit 215cf56

Browse files
zaelgoharyzaelgohary
committed
Merge branch 'development' of https://github.com/threefoldtech/threefold_connect into development_dynamic_layout
2 parents 484d08b + 91299b1 commit 215cf56

20 files changed

Lines changed: 715 additions & 183 deletions

‎app/android/app/build_local‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ android {
4040
}
4141

4242
compileOptions {
43+
coreLibraryDesugaringEnabled true
4344
sourceCompatibility JavaVersion.VERSION_17
4445
targetCompatibility JavaVersion.VERSION_17
4546
}
@@ -101,4 +102,7 @@ dependencies {
101102
implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
102103
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
103104
implementation "androidx.activity:activity:1.9.3"
105+
implementation 'androidx.window:window:1.0.0'
106+
implementation 'androidx.window:window-java:1.0.0'
107+
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
104108
}

‎app/android/app/build_production‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ android {
4040
}
4141

4242
compileOptions {
43+
coreLibraryDesugaringEnabled true
4344
sourceCompatibility JavaVersion.VERSION_17
4445
targetCompatibility JavaVersion.VERSION_17
4546
}
@@ -101,4 +102,7 @@ dependencies {
101102
implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
102103
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
103104
implementation "androidx.activity:activity:1.9.3"
105+
implementation 'androidx.window:window:1.0.0'
106+
implementation 'androidx.window:window-java:1.0.0'
107+
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
104108
}

‎app/android/app/build_staging‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ android {
4040
}
4141

4242
compileOptions {
43+
coreLibraryDesugaringEnabled true
4344
sourceCompatibility JavaVersion.VERSION_17
4445
targetCompatibility JavaVersion.VERSION_17
4546
}
@@ -101,4 +102,7 @@ dependencies {
101102
implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
102103
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
103104
implementation "androidx.activity:activity:1.9.3"
105+
implementation 'androidx.window:window:1.0.0'
106+
implementation 'androidx.window:window-java:1.0.0'
107+
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
104108
}

‎app/android/app/build_testing‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ android {
4040
}
4141

4242
compileOptions {
43+
coreLibraryDesugaringEnabled true
4344
sourceCompatibility JavaVersion.VERSION_17
4445
targetCompatibility JavaVersion.VERSION_17
4546
}
@@ -101,4 +102,7 @@ dependencies {
101102
implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
102103
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
103104
implementation "androidx.activity:activity:1.9.3"
105+
implementation 'androidx.window:window:1.0.0'
106+
implementation 'androidx.window:window-java:1.0.0'
107+
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
104108
}

‎app/android/app/src/main/AndroidManifest_local‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
22
<application tools:replace="android:label" android:label="ThreeFold Connect" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true" android:enableOnBackInvokedCallback="true">
3-
<activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
3+
<activity android:name=".MainActivity"
4+
android:exported="true"
5+
android:launchMode="singleTop"
6+
android:theme="@style/LaunchTheme"
7+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
8+
android:showWhenLocked="true"
9+
android:turnScreenOn="true"
410
android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize" android:enableOnBackInvokedCallback="false">
511
<meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
612
<meta-data android:name="io.flutter.embedding.android.SplashScreenDrawable" android:resource="@drawable/launch_background" />
@@ -32,6 +38,22 @@
3238
</intent-filter>
3339
</activity>
3440
<meta-data android:name="flutterEmbedding" android:value="2" />
41+
<service
42+
android:name="com.dexterous.flutterlocalnotifications.ForegroundService"
43+
android:exported="false"
44+
android:stopWithTask="false"
45+
android:foregroundServiceType="specialUse">
46+
<property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="To demonstrate how to use foreground services to show notifications"/>
47+
</service>
48+
<receiver android:exported="false" android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver" />
49+
<receiver android:exported="false" android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver">
50+
<intent-filter>
51+
<action android:name="android.intent.action.BOOT_COMPLETED"/>
52+
<action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
53+
<action android:name="android.intent.action.QUICKBOOT_POWERON" />
54+
<action android:name="com.htc.intent.action.QUICKBOOT_POWERON"/>
55+
</intent-filter>
56+
</receiver>
3557
</application>
3658

3759
<uses-permission android:name="android.permission.INTERNET" />
@@ -41,6 +63,14 @@
4163
<uses-permission android:name="android.permission.WAKE_LOCK" />
4264
<uses-permission android:name="android.permission.USE_FINGERPRINT" />
4365
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
66+
<uses-permission android:minSdkVersion="34" android:name="android.permission.USE_EXACT_ALARM" />
67+
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
68+
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
69+
<uses-permission android:name="android.permission.VIBRATE" />
70+
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
71+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
72+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
73+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
4474

4575
<uses-feature android:name="android.hardware.camera.autofocus" />
4676
<uses-feature android:name="android.hardware.camera" />

‎app/android/app/src/main/AndroidManifest_production‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
22
<application tools:replace="android:label" android:label="ThreeFold Connect" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true" android:enableOnBackInvokedCallback="true">
3-
<activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
3+
<activity android:name=".MainActivity"
4+
android:exported="true"
5+
android:launchMode="singleTop"
6+
android:theme="@style/LaunchTheme"
7+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
8+
android:showWhenLocked="true"
9+
android:turnScreenOn="true"
410
android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize" android:enableOnBackInvokedCallback="false">
511
<meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
612
<meta-data android:name="io.flutter.embedding.android.SplashScreenDrawable" android:resource="@drawable/launch_background" />
@@ -32,6 +38,22 @@
3238
</intent-filter>
3339
</activity>
3440
<meta-data android:name="flutterEmbedding" android:value="2" />
41+
<service
42+
android:name="com.dexterous.flutterlocalnotifications.ForegroundService"
43+
android:exported="false"
44+
android:stopWithTask="false"
45+
android:foregroundServiceType="specialUse">
46+
<property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="To demonstrate how to use foreground services to show notifications"/>
47+
</service>
48+
<receiver android:exported="false" android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver" />
49+
<receiver android:exported="false" android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver">
50+
<intent-filter>
51+
<action android:name="android.intent.action.BOOT_COMPLETED"/>
52+
<action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
53+
<action android:name="android.intent.action.QUICKBOOT_POWERON" />
54+
<action android:name="com.htc.intent.action.QUICKBOOT_POWERON"/>
55+
</intent-filter>
56+
</receiver>
3557
</application>
3658

3759
<uses-permission android:name="android.permission.INTERNET" />
@@ -41,6 +63,14 @@
4163
<uses-permission android:name="android.permission.WAKE_LOCK" />
4264
<uses-permission android:name="android.permission.USE_FINGERPRINT" />
4365
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
66+
<uses-permission android:minSdkVersion="34" android:name="android.permission.USE_EXACT_ALARM" />
67+
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
68+
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
69+
<uses-permission android:name="android.permission.VIBRATE" />
70+
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
71+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
72+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
73+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
4474

4575
<uses-feature android:name="android.hardware.camera.autofocus" />
4676
<uses-feature android:name="android.hardware.camera" />

‎app/android/app/src/main/AndroidManifest_staging‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
22
<application tools:replace="android:label" android:label="ThreeFold Connect" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true" android:enableOnBackInvokedCallback="true">
3-
<activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
3+
<activity android:name=".MainActivity"
4+
android:exported="true"
5+
android:launchMode="singleTop"
6+
android:theme="@style/LaunchTheme"
7+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
8+
android:showWhenLocked="true"
9+
android:turnScreenOn="true"
410
android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize" android:enableOnBackInvokedCallback="false">
511
<meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
612
<meta-data android:name="io.flutter.embedding.android.SplashScreenDrawable" android:resource="@drawable/launch_background" />
@@ -32,6 +38,22 @@
3238
</intent-filter>
3339
</activity>
3440
<meta-data android:name="flutterEmbedding" android:value="2" />
41+
<service
42+
android:name="com.dexterous.flutterlocalnotifications.ForegroundService"
43+
android:exported="false"
44+
android:stopWithTask="false"
45+
android:foregroundServiceType="specialUse">
46+
<property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="To demonstrate how to use foreground services to show notifications"/>
47+
</service>
48+
<receiver android:exported="false" android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver" />
49+
<receiver android:exported="false" android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver">
50+
<intent-filter>
51+
<action android:name="android.intent.action.BOOT_COMPLETED"/>
52+
<action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
53+
<action android:name="android.intent.action.QUICKBOOT_POWERON" />
54+
<action android:name="com.htc.intent.action.QUICKBOOT_POWERON"/>
55+
</intent-filter>
56+
</receiver>
3557
</application>
3658

3759
<uses-permission android:name="android.permission.INTERNET" />
@@ -41,6 +63,14 @@
4163
<uses-permission android:name="android.permission.WAKE_LOCK" />
4264
<uses-permission android:name="android.permission.USE_FINGERPRINT" />
4365
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
66+
<uses-permission android:minSdkVersion="34" android:name="android.permission.USE_EXACT_ALARM" />
67+
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
68+
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
69+
<uses-permission android:name="android.permission.VIBRATE" />
70+
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
71+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
72+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
73+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
4474

4575
<uses-feature android:name="android.hardware.camera.autofocus" />
4676
<uses-feature android:name="android.hardware.camera" />

‎app/android/app/src/main/AndroidManifest_testing‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
22
<application tools:replace="android:label" android:label="ThreeFold Connect" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true" android:enableOnBackInvokedCallback="true">
3-
<activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
3+
<activity android:name=".MainActivity"
4+
android:exported="true"
5+
android:launchMode="singleTop"
6+
android:theme="@style/LaunchTheme"
7+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
8+
android:showWhenLocked="true"
9+
android:turnScreenOn="true"
410
android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize" android:enableOnBackInvokedCallback="false">
511
<meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
612
<meta-data android:name="io.flutter.embedding.android.SplashScreenDrawable" android:resource="@drawable/launch_background" />
@@ -32,6 +38,22 @@
3238
</intent-filter>
3339
</activity>
3440
<meta-data android:name="flutterEmbedding" android:value="2" />
41+
<service
42+
android:name="com.dexterous.flutterlocalnotifications.ForegroundService"
43+
android:exported="false"
44+
android:stopWithTask="false"
45+
android:foregroundServiceType="specialUse">
46+
<property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="To demonstrate how to use foreground services to show notifications"/>
47+
</service>
48+
<receiver android:exported="false" android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver" />
49+
<receiver android:exported="false" android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver">
50+
<intent-filter>
51+
<action android:name="android.intent.action.BOOT_COMPLETED"/>
52+
<action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
53+
<action android:name="android.intent.action.QUICKBOOT_POWERON" />
54+
<action android:name="com.htc.intent.action.QUICKBOOT_POWERON"/>
55+
</intent-filter>
56+
</receiver>
3557
</application>
3658

3759
<uses-permission android:name="android.permission.INTERNET" />
@@ -41,6 +63,14 @@
4163
<uses-permission android:name="android.permission.WAKE_LOCK" />
4264
<uses-permission android:name="android.permission.USE_FINGERPRINT" />
4365
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
66+
<uses-permission android:minSdkVersion="34" android:name="android.permission.USE_EXACT_ALARM" />
67+
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
68+
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
69+
<uses-permission android:name="android.permission.VIBRATE" />
70+
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
71+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
72+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
73+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
4474

4575
<uses-feature android:name="android.hardware.camera.autofocus" />
4676
<uses-feature android:name="android.hardware.camera" />

‎app/android/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ allprojects {
55
mavenCentral()
66
maven { url 'https://jitpack.io' }
77
maven { url 'https://maven.google.com' }
8+
// [required] background_fetch
9+
maven { url "${project(':background_fetch').projectDir}/libs" }
810
}
911
}
1012

‎app/ios/Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,4 +257,4 @@ SPEC CHECKSUMS:
257257

258258
PODFILE CHECKSUM: 050ff199c8e97450c391a88d64db90da96da9995
259259

260-
COCOAPODS: 1.16.2
260+
COCOAPODS: 1.16.2

0 commit comments

Comments
 (0)