From c4696f2d9fb35cb9129f3cb64561b8311e077284 Mon Sep 17 00:00:00 2001 From: dwindown Date: Sun, 15 Mar 2026 13:38:34 +0700 Subject: [PATCH] fix: resolve Android build issues (v2 embedding, desugaring, duplicate compass plugin) --- .metadata | 5 +- android/.gitignore | 14 ++++ android/app/build.gradle | 11 --- android/app/build.gradle.kts | 68 ++++++++++++++++++ android/app/src/debug/AndroidManifest.xml | 7 ++ android/app/src/main/AndroidManifest.xml | 48 +++++++++++++ .../plugins/GeneratedPluginRegistrant.java | 5 -- .../com/jamshalat/diary/MainActivity.kt | 6 ++ .../res/drawable-v21/launch_background.xml | 12 ++++ .../main/res/drawable/launch_background.xml | 12 ++++ .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 544 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 442 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 721 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 1031 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 1443 bytes .../app/src/main/res/values-night/styles.xml | 18 +++++ android/app/src/main/res/values/styles.xml | 18 +++++ android/app/src/profile/AndroidManifest.xml | 7 ++ android/app/upload-keystore.p12 | Bin 0 -> 2664 bytes android/build.gradle.kts | 24 +++++++ android/gradle.properties | 2 + .../gradle/wrapper/gradle-wrapper.properties | 5 ++ android/local.properties | 5 +- android/settings.gradle.kts | 26 +++++++ ios/Runner/GeneratedPluginRegistrant.m | 7 -- pubspec.lock | 16 ----- pubspec.yaml | 3 - 27 files changed, 272 insertions(+), 47 deletions(-) create mode 100644 android/.gitignore delete mode 100644 android/app/build.gradle create mode 100644 android/app/build.gradle.kts create mode 100644 android/app/src/debug/AndroidManifest.xml create mode 100644 android/app/src/main/AndroidManifest.xml create mode 100644 android/app/src/main/kotlin/com/jamshalat/diary/MainActivity.kt create mode 100644 android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 android/app/src/main/res/drawable/launch_background.xml create mode 100644 android/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 android/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 android/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 android/app/src/main/res/values-night/styles.xml create mode 100644 android/app/src/main/res/values/styles.xml create mode 100644 android/app/src/profile/AndroidManifest.xml create mode 100644 android/app/upload-keystore.p12 create mode 100644 android/build.gradle.kts create mode 100644 android/gradle.properties create mode 100644 android/gradle/wrapper/gradle-wrapper.properties create mode 100644 android/settings.gradle.kts diff --git a/.metadata b/.metadata index 5ba6a80..df13aa7 100644 --- a/.metadata +++ b/.metadata @@ -15,10 +15,7 @@ migration: - platform: root create_revision: ff37bef603469fb030f2b72995ab929ccfc227f0 base_revision: ff37bef603469fb030f2b72995ab929ccfc227f0 - - platform: macos - create_revision: ff37bef603469fb030f2b72995ab929ccfc227f0 - base_revision: ff37bef603469fb030f2b72995ab929ccfc227f0 - - platform: web + - platform: android create_revision: ff37bef603469fb030f2b72995ab929ccfc227f0 base_revision: ff37bef603469fb030f2b72995ab929ccfc227f0 diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 0000000..be3943c --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,14 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java +.cxx/ + +# Remember to never publicly share your keystore. +# See https://flutter.dev/to/reference-keystore +key.properties +**/*.keystore +**/*.jks diff --git a/android/app/build.gradle b/android/app/build.gradle deleted file mode 100644 index 72c2e0d..0000000 --- a/android/app/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -android { - compileSdkVersion 34 - - defaultConfig { - applicationId "com.jamshalat.diary" - minSdkVersion 21 - targetSdkVersion 34 - versionCode 1 - versionName "1.0.0" - } -} \ No newline at end of file diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts new file mode 100644 index 0000000..b2b158d --- /dev/null +++ b/android/app/build.gradle.kts @@ -0,0 +1,68 @@ +plugins { + id("com.android.application") + id("kotlin-android") + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id("dev.flutter.flutter-gradle-plugin") +} + +import java.io.FileInputStream +import java.util.Properties + +val keystorePropertiesFile = rootProject.file("key.properties") +val keystoreProperties = Properties() +if (keystorePropertiesFile.exists()) { + keystoreProperties.load(FileInputStream(keystorePropertiesFile)) +} + +android { + namespace = "com.jamshalat.diary" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + isCoreLibraryDesugaringEnabled = true + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_17.toString() + } + + signingConfigs { + create("release") { + keyAlias = keystoreProperties["keyAlias"] as String? + keyPassword = keystoreProperties["keyPassword"] as String? + storeFile = keystoreProperties["storeFile"]?.let { file(it) } + storePassword = keystoreProperties["storePassword"] as String? + storeType = "PKCS12" + } + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.jamshalat.diary" + // You can update the following values to match your application needs. + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig = signingConfigs.getByName("release") + } + } +} + +flutter { + source = "../.." +} + +dependencies { + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4") +} diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..9e92e50 --- /dev/null +++ b/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java index 3c492ae..4ab9f10 100644 --- a/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java +++ b/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java @@ -25,11 +25,6 @@ public final class GeneratedPluginRegistrant { } catch (Exception e) { Log.e(TAG, "Error registering plugin audio_session, com.ryanheise.audio_session.AudioSessionPlugin", e); } - try { - flutterEngine.getPlugins().add(new com.hemanthraj.fluttercompass.FlutterCompassPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin flutter_compass, com.hemanthraj.fluttercompass.FlutterCompassPlugin", e); - } try { flutterEngine.getPlugins().add(new com.hemanthraj.fluttercompass.FlutterCompassPlugin()); } catch (Exception e) { diff --git a/android/app/src/main/kotlin/com/jamshalat/diary/MainActivity.kt b/android/app/src/main/kotlin/com/jamshalat/diary/MainActivity.kt new file mode 100644 index 0000000..1ac2fa1 --- /dev/null +++ b/android/app/src/main/kotlin/com/jamshalat/diary/MainActivity.kt @@ -0,0 +1,6 @@ +package com.jamshalat.diary + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() { +} diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..304732f --- /dev/null +++ b/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..db77bb4b7b0906d62b1847e87f15cdcacf6a4f29 GIT binary patch literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..17987b79bb8a35cc66c3c1fd44f5a5526c1b78be GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@Uy!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..d5f1c8d34e7a88e3f88bea192c3a370d44689c3c GIT binary patch literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xjc(B0U1_% zz5^97Xt*%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3 zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc z$|q_opQ^2TrnVZ0o~wh<3t%W&flvYGe#$xqda2bR_R zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2 z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b zpQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o zo~|9I;xof literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6372eebdb28e45604e46eeda8dd24651419bc0 GIT binary patch literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..06952be --- /dev/null +++ b/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..cb1ef88 --- /dev/null +++ b/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/android/app/upload-keystore.p12 b/android/app/upload-keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..5d2289b9d4e0d2bb4ea673493ea99711af1a3b45 GIT binary patch literal 2664 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"clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 0000000..fbee1d8 --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1,2 @@ +org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError +android.useAndroidX=true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e4ef43f --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip diff --git a/android/local.properties b/android/local.properties index f34f6c9..715bc9e 100644 --- a/android/local.properties +++ b/android/local.properties @@ -1,2 +1,5 @@ sdk.dir=/Users/dwindown/Library/Android/sdk -flutter.sdk=/Users/dwindown/FlutterDev/flutter \ No newline at end of file +flutter.sdk=/Users/dwindown/FlutterDev/flutter +flutter.buildMode=release +flutter.versionName=1.0.0 +flutter.versionCode=1 \ No newline at end of file diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts new file mode 100644 index 0000000..ca7fe06 --- /dev/null +++ b/android/settings.gradle.kts @@ -0,0 +1,26 @@ +pluginManagement { + val flutterSdkPath = + run { + val properties = java.util.Properties() + file("local.properties").inputStream().use { properties.load(it) } + val flutterSdkPath = properties.getProperty("flutter.sdk") + require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } + flutterSdkPath + } + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id("dev.flutter.flutter-plugin-loader") version "1.0.0" + id("com.android.application") version "8.11.1" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false +} + +include(":app") diff --git a/ios/Runner/GeneratedPluginRegistrant.m b/ios/Runner/GeneratedPluginRegistrant.m index 766e65e..be91b61 100644 --- a/ios/Runner/GeneratedPluginRegistrant.m +++ b/ios/Runner/GeneratedPluginRegistrant.m @@ -18,12 +18,6 @@ @import audio_session; #endif -#if __has_include() -#import -#else -@import flutter_compass; -#endif - #if __has_include() #import #else @@ -84,7 +78,6 @@ [AudioServicePlugin registerWithRegistrar:[registry registrarForPlugin:@"AudioServicePlugin"]]; [AudioSessionPlugin registerWithRegistrar:[registry registrarForPlugin:@"AudioSessionPlugin"]]; [FlutterCompassPlugin registerWithRegistrar:[registry registrarForPlugin:@"FlutterCompassPlugin"]]; - [FlutterCompassPlugin registerWithRegistrar:[registry registrarForPlugin:@"FlutterCompassPlugin"]]; [FlutterLocalNotificationsPlugin registerWithRegistrar:[registry registrarForPlugin:@"FlutterLocalNotificationsPlugin"]]; [FlutterQiblahPlugin registerWithRegistrar:[registry registrarForPlugin:@"FlutterQiblahPlugin"]]; [GeocodingPlugin registerWithRegistrar:[registry registrarForPlugin:@"GeocodingPlugin"]]; diff --git a/pubspec.lock b/pubspec.lock index 0d32f70..f377906 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -334,14 +334,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.4.1" - flutter_compass: - dependency: "direct main" - description: - name: flutter_compass - sha256: "1b4d7e6c95a675ec8482b5c9c9ccf1ebf0ced3dbec59dce28ad609da953de850" - url: "https://pub.dev" - source: hosted - version: "0.8.1" flutter_compass_v2: dependency: transitive description: @@ -765,14 +757,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.13.0" - material_symbols_icons: - dependency: "direct main" - description: - name: material_symbols_icons - sha256: c62b15f2b3de98d72cbff0148812f5ef5159f05e61fc9f9a089ec2bb234df082 - url: "https://pub.dev" - source: hosted - version: "4.2906.0" meta: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 5b5411b..02f3726 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -31,8 +31,6 @@ dependencies: # Qibla flutter_qiblah: ^3.0.0 - flutter_compass: ^0.8.1 - # Notifications flutter_local_notifications: ^21.0.0 @@ -42,7 +40,6 @@ dependencies: # Fonts & Icons google_fonts: ^8.0.2 - material_symbols_icons: ^4.2719.3 # Utils intl: ^0.20.0