From a6d334ef6a447e78a721566468b1352988c9e64e Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Reddy Satti Date: Sun, 12 Feb 2023 01:52:10 +0900 Subject: [PATCH] Modify notification shade collapse to android API call --- README.md | 2 +- app/build.gradle.kts | 10 +- app/src/main/AndroidManifest.xml | 8 +- .../android/screentranslator/MainActivity.kt | 58 ++++++ .../ScreenTranslatorApplication.kt | 2 +- .../drawable-v24/ic_launcher_foreground.xml | 30 ---- .../res/drawable/ic_launcher_background.xml | 170 ------------------ .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 - app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 1404 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 2898 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 982 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 1772 -> 0 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 1900 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 3918 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 2884 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 5914 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 3844 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 7778 -> 0 bytes app/src/main/res/values/strings.xml | 4 - .../res/xml/accessibility_service_config.xml | 7 - .../AndroidApplicationConventionPlugin.kt | 2 - .../kotlin/AndroidLibraryConventionPlugin.kt | 2 - .../buildlogic/KotlinAndroid.kt | 8 +- .../OfflineFirstUserDataRepository.kt | 6 - .../data/repository/UserDataRepository.kt | 4 - .../datastore/UserPreferencesDataSource.kt | 20 --- .../core/datastore/user_preferences.proto | 2 - .../core/data/model/UserData.kt | 2 - core/resource/build.gradle.kts | 7 + .../src/main/ic_launcher-playstore-dark.png | Bin 0 -> 15025 bytes .../src/main/ic_launcher-playstore-light.png | Bin 0 -> 15170 bytes .../res/drawable-anydpi/ic_translate_tile.xml | 11 +- .../res/drawable/ic_launcher_foreground.xml | 15 ++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 +- .../res/values-night/ic_launcher_colors.xml | 5 + .../resource}/src/main/res/values/colors.xml | 0 .../main/res/values/ic_launcher_colors.xml | 5 + core/resource/src/main/res/values/strings.xml | 20 +++ .../resource}/src/main/res/values/themes.xml | 0 core/ui/build.gradle.kts | 1 + .../screentranslator/core/ui/HomeScreen.kt | 3 +- core/ui/src/main/res/values/strings.xml | 6 - .../feature/settings/SettingsUi.kt | 146 ++------------- .../feature/settings/SettingsViewModel.kt | 21 +-- feature/translate/build.gradle.kts | 1 + .../ScreenTranslatorAccessibilityService.kt | 153 +++++++++------- .../translate/ScreenTranslatorTileService.kt | 1 - .../feature/translate/Utils.kt | 2 + .../translate/src/main/res/values/strings.xml | 6 - .../xml-v33/accessibility_service_config.xml | 8 + .../res/xml/accessibility_service_config.xml | 7 + .../translate}/src/main/res/xml/filepaths.xml | 0 gradle/libs.versions.toml | 7 +- settings.gradle.kts | 1 + 54 files changed, 273 insertions(+), 500 deletions(-) delete mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml delete mode 100644 app/src/main/res/drawable/ic_launcher_background.xml delete mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp delete mode 100644 app/src/main/res/values/strings.xml delete mode 100644 app/src/main/res/xml/accessibility_service_config.xml create mode 100644 core/resource/build.gradle.kts create mode 100644 core/resource/src/main/ic_launcher-playstore-dark.png create mode 100644 core/resource/src/main/ic_launcher-playstore-light.png rename app/src/main/res/drawable/ic_baseline_translate_24.xml => core/resource/src/main/res/drawable-anydpi/ic_translate_tile.xml (70%) create mode 100644 core/resource/src/main/res/drawable/ic_launcher_foreground.xml rename {app => core/resource}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (57%) create mode 100644 core/resource/src/main/res/values-night/ic_launcher_colors.xml rename {app => core/resource}/src/main/res/values/colors.xml (100%) create mode 100644 core/resource/src/main/res/values/ic_launcher_colors.xml create mode 100644 core/resource/src/main/res/values/strings.xml rename {app => core/resource}/src/main/res/values/themes.xml (100%) delete mode 100644 core/ui/src/main/res/values/strings.xml delete mode 100644 feature/translate/src/main/res/values/strings.xml create mode 100644 feature/translate/src/main/res/xml-v33/accessibility_service_config.xml create mode 100644 feature/translate/src/main/res/xml/accessibility_service_config.xml rename {app => feature/translate}/src/main/res/xml/filepaths.xml (100%) diff --git a/README.md b/README.md index 7e9110b..fb31f1d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Notice that using the Screen Translator app is much quicker than the traditional 1. When user touches the quick settings tile, an intent is sent by `ScreenTranslatorTileService::onClick` to trigger `ScreenTranslatorAccessibilityService::onStartCommand` 2. If the user didn't give accessibility permissions yet, they are redirected to accessibility settings page. -3. If the accessibility permissions are present, a swipe up gesture is sent to system uisng accessiblity service to collapse notification panel from which quick settings tile was triggered. +3. If the accessibility permissions are present, notification panel collapse request is send to system. 4. Finally, a screenshot is taken using accessiblity service and sent to Papago / Google Lens app for further translation inside their app's activity. 5. If Papago / Google Lens app is not installed in the system, user is notified of the same through a toast. diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b46f373..537b4e3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -9,8 +9,8 @@ android { defaultConfig { applicationId = "com.vamsi3.android.screentranslator" - versionCode = 2 - versionName = "0.0.3" + versionCode = 4 + versionName = "0.0.4" } buildTypes { @@ -26,10 +26,12 @@ android { } dependencies { - implementation(project(":core:design")) + implementation(project(":core:ui")) + implementation(project(":core:resource")) implementation(project(":feature:settings")) implementation(project(":feature:translate")) - implementation(project(":core:ui")) implementation(libs.androidx.hilt.navigation.compose) implementation(libs.androidx.appcompat) + implementation(libs.androidx.compose.material.icons) + implementation(libs.androidx.core.splashscreen) } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 914bbe9..0d9152c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,7 +16,6 @@ android:name=".ScreenTranslatorApplication" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="false" android:theme="@style/Theme.ScreenTranslator"> @@ -37,12 +36,15 @@ + - + true + is Success -> false + } + } + setContent { HomeScreen() } + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + val statusBarManager = getSystemService(StatusBarManager::class.java) + + statusBarManager.requestAddTileService( + ComponentName( + this, + ScreenTranslatorTileService::class.java, + ), + getString(R.string.translate_tile_label), + Icon.createWithResource(this, R.drawable.ic_translate_tile), + {}, + {} + ) + } } } diff --git a/app/src/main/java/com/vamsi3/android/screentranslator/ScreenTranslatorApplication.kt b/app/src/main/java/com/vamsi3/android/screentranslator/ScreenTranslatorApplication.kt index 0bafcce..2d52d9a 100644 --- a/app/src/main/java/com/vamsi3/android/screentranslator/ScreenTranslatorApplication.kt +++ b/app/src/main/java/com/vamsi3/android/screentranslator/ScreenTranslatorApplication.kt @@ -4,4 +4,4 @@ import android.app.Application import dagger.hilt.android.HiltAndroidApp @HiltAndroidApp -class ScreenTranslatorApplication : Application() {} +class ScreenTranslatorApplication : Application() diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 7706ab9..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 6b78462..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78ecd372343283f4157dcfd918ec5165bb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2898 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 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d64e58ba64d180ce43ee13bf9a17835fbca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a3070fe34c611c42c0d3ad3013a0dce358be0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml deleted file mode 100644 index 5c6582b..0000000 --- a/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - Screen Translator - Translate your screen using Translate Apps of your choice - diff --git a/app/src/main/res/xml/accessibility_service_config.xml b/app/src/main/res/xml/accessibility_service_config.xml deleted file mode 100644 index 14a5502..0000000 --- a/app/src/main/res/xml/accessibility_service_config.xml +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt index bc945d6..ac622df 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt @@ -11,7 +11,6 @@ class AndroidApplicationConventionPlugin : Plugin { apply("com.android.application") apply("org.jetbrains.kotlin.android") } - extensions.configure { configureKotlinAndroid(this) defaultConfig { @@ -20,5 +19,4 @@ class AndroidApplicationConventionPlugin : Plugin { } } } - } diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt index a4f5760..3853e04 100644 --- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt @@ -13,10 +13,8 @@ class AndroidLibraryConventionPlugin : Plugin { apply("com.android.library") apply("org.jetbrains.kotlin.android") } - extensions.configure { configureKotlinAndroid(this) - defaultConfig.targetSdk = 33 } dependencies { add("androidTestImplementation", kotlin("test")) diff --git a/build-logic/convention/src/main/kotlin/com/vamsi3/android/screentranslator/buildlogic/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/vamsi3/android/screentranslator/buildlogic/KotlinAndroid.kt index 9aeb655..0a44543 100644 --- a/build-logic/convention/src/main/kotlin/com/vamsi3/android/screentranslator/buildlogic/KotlinAndroid.kt +++ b/build-logic/convention/src/main/kotlin/com/vamsi3/android/screentranslator/buildlogic/KotlinAndroid.kt @@ -18,23 +18,19 @@ internal fun Project.configureKotlinAndroid( ) { commonExtension.apply { compileSdk = 33 - defaultConfig { - minSdk = 23 + minSdk = 30 } - compileOptions { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 isCoreLibraryDesugaringEnabled = true } - kotlinOptions { // Treat all Kotlin warnings as errors (disabled by default) // Override by setting warningsAsErrors=true in your ~/.gradle/gradle.properties val warningsAsErrors: String? by project allWarningsAsErrors = warningsAsErrors.toBoolean() - freeCompilerArgs = freeCompilerArgs + listOf( "-opt-in=kotlin.RequiresOptIn", // Enable experimental coroutines APIs, including Flow @@ -42,13 +38,11 @@ internal fun Project.configureKotlinAndroid( "-opt-in=kotlinx.coroutines.FlowPreview", "-opt-in=kotlin.Experimental", ) - jvmTarget = JavaVersion.VERSION_11.toString() } } val libs = extensions.getByType().named("libs") - dependencies { add("coreLibraryDesugaring", libs.findLibrary("android.desugarJdkLibs").get()) } diff --git a/core/data/src/main/java/com/vamsi3/android/screentranslator/core/data/repository/OfflineFirstUserDataRepository.kt b/core/data/src/main/java/com/vamsi3/android/screentranslator/core/data/repository/OfflineFirstUserDataRepository.kt index d2d33e5..e8452a9 100644 --- a/core/data/src/main/java/com/vamsi3/android/screentranslator/core/data/repository/OfflineFirstUserDataRepository.kt +++ b/core/data/src/main/java/com/vamsi3/android/screentranslator/core/data/repository/OfflineFirstUserDataRepository.kt @@ -12,12 +12,6 @@ class OfflineFirstUserDataRepository @Inject constructor( override val userData = userPreferencesDataSource.userData - override suspend fun setUseNotificationPanelSwipeUp(useNotificationPanelSwipeUp: Boolean) = - userPreferencesDataSource.setUseNotificationPanelSwipeUp(useNotificationPanelSwipeUp) - - override suspend fun setNotificationPanelSwipeUpDuration(notificationPanelSwipeUpDuration: Duration) = - userPreferencesDataSource.setNotificationPanelSwipeUpDuration(notificationPanelSwipeUpDuration) - override suspend fun setThemeMode(themeMode: ThemeMode) = userPreferencesDataSource.setThemeMode(themeMode) diff --git a/core/data/src/main/java/com/vamsi3/android/screentranslator/core/data/repository/UserDataRepository.kt b/core/data/src/main/java/com/vamsi3/android/screentranslator/core/data/repository/UserDataRepository.kt index ed39232..4972205 100644 --- a/core/data/src/main/java/com/vamsi3/android/screentranslator/core/data/repository/UserDataRepository.kt +++ b/core/data/src/main/java/com/vamsi3/android/screentranslator/core/data/repository/UserDataRepository.kt @@ -9,10 +9,6 @@ import kotlin.time.Duration interface UserDataRepository { val userData: StateFlow - suspend fun setUseNotificationPanelSwipeUp(useNotificationPanelSwipeUp: Boolean) - - suspend fun setNotificationPanelSwipeUpDuration(notificationPanelSwipeUpDuration: Duration) - suspend fun setThemeMode(themeMode: ThemeMode) suspend fun setTranslateApp(translateApp: TranslateApp) diff --git a/core/datastore/src/main/java/com/vamsi3/android/screentranslator/core/datastore/UserPreferencesDataSource.kt b/core/datastore/src/main/java/com/vamsi3/android/screentranslator/core/datastore/UserPreferencesDataSource.kt index 5f4b661..bb3e3ba 100644 --- a/core/datastore/src/main/java/com/vamsi3/android/screentranslator/core/datastore/UserPreferencesDataSource.kt +++ b/core/datastore/src/main/java/com/vamsi3/android/screentranslator/core/datastore/UserPreferencesDataSource.kt @@ -19,8 +19,6 @@ class UserPreferencesDataSource @Inject constructor( val userData = userPreferencesProto.data .map { UserData( - useNotificationPanelSwipeUp = it.useNotificationPanelSwipeUp, - notificationPanelSwipeUpDuration = it.notificationPanelSwipeUpDurationMilliseconds.milliseconds, themeMode = when(it.userThemePreference) { null, UserThemePreferenceProto.UNRECOGNIZED, @@ -40,28 +38,10 @@ class UserPreferencesDataSource @Inject constructor( ) } .stateIn(CoroutineScope(Dispatchers.IO), SharingStarted.Eagerly, UserData( - true, - 300.milliseconds, ThemeMode.SYSTEM, TranslateApp.GOOGLE_LENS )) - suspend fun setUseNotificationPanelSwipeUp(useNotificationPanelSwipeUp: Boolean) { - userPreferencesProto.updateData { - it.copy { - this.useNotificationPanelSwipeUp = useNotificationPanelSwipeUp - } - } - } - - suspend fun setNotificationPanelSwipeUpDuration(notificationPanelSwipeUpDuration: Duration) { - userPreferencesProto.updateData { - it.copy { - this.notificationPanelSwipeUpDurationMilliseconds = notificationPanelSwipeUpDuration.inWholeMilliseconds.toInt() - } - } - } - suspend fun setThemeMode(themeMode: ThemeMode) { userPreferencesProto.updateData { it.copy { diff --git a/core/datastore/src/main/proto/com/vamsi3/android/screentranslator/core/datastore/user_preferences.proto b/core/datastore/src/main/proto/com/vamsi3/android/screentranslator/core/datastore/user_preferences.proto index b429ca0..54c5ed0 100644 --- a/core/datastore/src/main/proto/com/vamsi3/android/screentranslator/core/datastore/user_preferences.proto +++ b/core/datastore/src/main/proto/com/vamsi3/android/screentranslator/core/datastore/user_preferences.proto @@ -7,8 +7,6 @@ option java_package = "com.vamsi3.android.screentranslator.core.datastore"; option java_multiple_files = true; message UserPreferencesProto { - bool use_notification_panel_swipe_up = 1; - int32 notification_panel_swipe_up_duration_milliseconds = 2; UserThemePreferenceProto user_theme_preference = 3; UserTranslateAppPreferenceProto user_translate_app_preference = 4; } diff --git a/core/model/src/main/java/com/vamsi3/android/screentranslator/core/data/model/UserData.kt b/core/model/src/main/java/com/vamsi3/android/screentranslator/core/data/model/UserData.kt index 127b40c..eab6f23 100644 --- a/core/model/src/main/java/com/vamsi3/android/screentranslator/core/data/model/UserData.kt +++ b/core/model/src/main/java/com/vamsi3/android/screentranslator/core/data/model/UserData.kt @@ -6,8 +6,6 @@ import kotlin.time.Duration * Class summarizing user interest data */ data class UserData( - val useNotificationPanelSwipeUp: Boolean, - val notificationPanelSwipeUpDuration: Duration, val themeMode: ThemeMode, val translateApp: TranslateApp, ) diff --git a/core/resource/build.gradle.kts b/core/resource/build.gradle.kts new file mode 100644 index 0000000..7c8d661 --- /dev/null +++ b/core/resource/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + id("screentranslator.build.android.library") +} + +android { + namespace = "com.vamsi3.android.screentranslator.core.resource" +} diff --git a/core/resource/src/main/ic_launcher-playstore-dark.png b/core/resource/src/main/ic_launcher-playstore-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..c9e08ffacd8ec9be4214abf7c3426f387f73316e GIT binary patch literal 15025 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 WbKBvwAHe~G^t6q&DzDvn^8WzU+*(us literal 0 HcmV?d00001 diff --git a/core/resource/src/main/ic_launcher-playstore-light.png b/core/resource/src/main/ic_launcher-playstore-light.png new file mode 100644 index 0000000000000000000000000000000000000000..6b49fcfbc1749c2c0522bfcab64919e1dadb86dd GIT binary patch literal 15170 zcmeIZ`9G9j{62nLLRs6a*(#M}DO<>zT`Eyzns4?W9D<__5S<`-|sKq@B0@#%zd9Z_c`bJd|ub}yzZAbuN!e65@~B!^d=zXoC)i} zH~KoKU$L4nKVj9?;k)U7v-;nMfS+pf)2M;|0JR?u;!C#o1PbBsrdD|^-(znTHJdHb z<>l%dFa&kgmkEM=cI4>@@O48*;76M-EBJXr|9}7d-*xzZ?hr_Dhmf`2lvw-r&h)D? zuM>yF4Mm}QoJ^2$M_0U^%h#v9Yu^O&SORt_k00++ZshSpl~E9s|2I~?H6=e^Z*78} zDXk!);^o8->D=Rhbc8t|DEBqE0$e4r@c*rUNcznW2dM?jp46KfxxsEqqndO{c#q^7 znEmT~sc0zsBEb{u)0=!2A&f53vEqaDCYQ&JE(I@!&X3i|>rIV^l$g|esm1By3i)Mi z%@V{=@wR;8HLeJGRbPT~BrNKa1oX6RrXO2in(EPogd`%>gBMTF4Ztq`-_IZ>h(ny2 zvATTBtdK-F2lPUnS%-rULas>ux7Lz65cD+$LVh|0J^lad#edLr{X+8$>8sD73dy|SCAk0G z&#QSn|MMYbk4%>_O2|t2{;oy{Oy%+VYI<&DtFCtH;Ac$10L(8}hMsUjO%jBK3Y&*W;4a!C?@TF;UGD`1 zUDhYljN$}cxG?o@$&wCU#0nN2>R|{nB95XJUFA&u{Y}7tx>!N0a%wqs6Ym4E%PJ^! zC;Z3+=XZ*(Sr>2O-za+q&kue~7PvyKgI;KZ*+ZgF%oF<2+R!diwA#jdgEb-_Sqa!J#;+1c~ zj$Dy|pub9ZZI8KZu-u8_8?UsM32ih)p@DtAOlffJ>`=5AO0p!ZCsMu^L* zIG;cG=xZRK)}zT6r=^Z7f%|UV>g#WLtSwjvaR@L&d`|E!`b@ervmLd_w$@EnK;BUi zj3~#rZF5QE^tae_#)w%VG?5O9b|M6_rT+Xl{dd*T7TL$NC|nw@j?`ahjuryLf$ik8 z00%Lp+C@e%x>gn}PimItUZ^HJSeO4k)rD_qM^aCdm9*$O-e%uk-F`5XTVN;)eSHZ* z`h!0+!%$3P+Q#^`P5iq8v-D;EnLcyIx`0x0au!!-cgb(+fv+h+8!Y*oTi09ne6p~C zJuqJ6qmxkEE4zl}eqL?rx&1xfL*FsQ6MZ}D)^WD>HO}3R#TI$>7me|ls_7X2UCIH* zkOmO)IH)RXS?qH^GPD(r%iKwGA9*NT_k|I4Ya7@J<9e_5x_$HOa#A3wQo0l9E*KVx z77nOVujmP{xRw|(fCvt>$@*;BKTPqup=SB-rXZuq5W1*(xP;N`4~%W`VTEk+5}3N; zGahgWsvMWKwLf$H!+p#Y^HOV(d1&>+A3pX1c83Jy&Vzj1F{&-WbQrq#1N;q-AeyC| zbKyEsPyDK?8AJPBHDah~QK%^AiKU%SJ%2!TI@h+rM+U64!U7XtB>0ws8tCeCE=4w; zj6?hvF60>{D0;lS_fD}PPFVSl523{qEZ0Ro=w7A|FTORR;or|pte~;i z5X+-LyUBWQjd*yje$j;M&kv_S%2O?mG7nn7q;HT^g*G7L6RZ%c9{XorEut6KX_a{g z4{W(+OBO2)o_il#9x+^KZa0m>r)Y*<-)zg*)N8U!snA@BKL!8EO?QfdH@hmEZU63Hx$^8WiZ0V zJVPbDKiyYw<8)KJNP}s|^Z58JujHSf<3u%d%N?4%!BbW7L40o~5OkQY5z)s}+#75U=zDd=y3t+LF8#q^*_;G0okpvjecx$In|`B9xdn`p+bpBp3F?i6>_^ZJCE?V)2Ff7r?V)41OD>7dU2laPd5pn7ZQ>YD+! z*~#Vm8x}g5>fA?ynKCx_V2%FXlSTW*02cHUP%&}uq0@5A(9~?rz;h5OYVqw|XS|PI zap`Ly+*_zPyZAF3eL*||qdEBQXu$w&?xzFaeB>cyEPw+UHLmierlyTL*)F6!Nb`a* z@4%45LE8JTrV04{U6Su7QW^cq4A4!LjB_O+8+9&-vt zr+7C_Meb7W`maA+aV5Z7!yOhzy#+%n=vJKkRH9Y4cEtCp2fddn#w>2aDMZ;=0lF84 zxswGvSKz;%gT>YrQ5TI5=#rmeD<+O@kG5$=>^|;Z-X$H>1NpiIIzsLi*By4?sq@4p zdyV&^Po$|lQnSFnel>PA0@Yw%Ko4Bip;c||s#`N=*>)Ch6(ttvpDk#J*$ zp5oGE@dZBPyItvSe3ak!GM{~Uyq;xYT}rGC+ux0!t|sZ;F1~g9=Z8ij27_+$pD9d{ z%e-%&AmKJRLRz*Z>TQF3l>gunkOJbU#fJKeJAr%)Y=2Q}^3;1hjJ*7k}V`K)E(_giJQKU~RkEf#i| z`8w_3#oA-%kA*k%qQgjKA^G|*hy9k+nE0SXzUA?-3lotV{hn{8>6f^li1jH3El^xT z5`0IcZm{PhpB*qMvki*Fay(&s9lrCXrM{bnv(FhAcO9T<$+h>(yZ*dF5I%~C*SX07 z84JQ2FclLzy{R$@t1iM%&)@#s`}LU_Y%k?XX7AwqoX@z{Ydn;1Il#ge?&D&9_2idF ze?K?yP9Pknbj9VBJusL?WkC*JX6Q)YXqg5|bC)JRB0&sTXXAd~gR2v9^c-mUc^_00 zNB@5uk+RXlJkdD&c?LK0mK*H44j)YN=~#zlgbwn3a@ArT^JU)F07Jd1{|xY4YlAO= z{!I93>D?N$=3r5jp`6f|dQmhTL`;Ek(o`2(h*i`p@JBm@))lS(+be!~^|eIPFb9ft)&1ks6Ng?A zHX>;|H(iTpsbYavWwzYYxX$F@%u=i3SC*~{5?8=N88-(nrGrx5-nM~}GAjW=(ZC7&S+(G70~j_Sea|9Wc-BgzMvf_K(_Ig(lE8!uJM+}CH941XZK zS)tRXQOOSVUa1Y4KfnVX(=58zm*VcfWQ)^ashyy%P8Su}HDq;7aK9or73QZTXGhvP zVdjoxDld%8Sx)ahjVhO&AIeL&P`oF?1RXTXo?jTf5>dZIzs3D3_|OM!L{gQa4wl`% zWt(d8j1aX)cjTiqqU#mKls!sEEa^>skz30wet5mz^Sf&9FlO#ILU*m1Tcp9d<6a(h zZ7GXV^Z$3L)h0S8#-WBQJCgLy3cw*Y4e~HHTXsoB1kiB8u5`8?egm!`D=NX+JVHu@4nN z3Omuz@i675x{}WytKj87p7x4Z;uIPzupsuFmu;N~iE@qm38*|@M{aL6iAgxxv81Z} zb{}ub45_Us->$H0h+1`h0-*EV{96SfE`Ps%>#FmQ-}Ky`N&i9kt3e|jQ&EpCSbF!E z3z-8l!a;Zo36M-FSSxdvfalHHt4`5u@iY5dcoDk%IrSe7Euja6v}q))$DL!!y8#!2 z7g?v(pZx-r=iLE@i1LCfb75&H&-Gjb{D48&DasNa=JV%^v%R>$(geb00qgs~zNqr^ z-I~{bS{@ICiX*vMA^qoaIm51mrgQR+B&I17@vFqej*nMs({AIUb;Y^ogH~ZB3L|+% zL9#FD`%sl3q?3OobVdJ8neACAv$Tt?HhI@XPP(t$1y$J3+&*abyTJ}+B&w_KP&3G& zJ>$*1@mnmN!c0(70BJOW!OXDLSo(~x!R{ZlRq?TRS`qx5J+y4c7+Jge?z;Uok|}`p z0&@0$Yn}#yxeWtR!)0aC$mUAJgi1lS91fKF zqQ&_$Q^S_Tq%>#+@_d?{gHMYqc0P0c?ZxSM&osBz{os1+?O{3%X#?=W8s*$?gV;2E z4}P7DeWIcdygMUM#%-kV2jfyDN= zM@&r&d?noKO*&QNH-2Qu7rj(?7Alp5+JxZe?E%mfgjK&h9Wd*4DSX?w5x$YON?Y+& zi`acaA*r@~@pf}H*H9(kvXkPZOw`XBlM3SXvg z>&~b~))->x$S=IFYZ^!d?bBj5x)3rT5c(BKI&kQ;)HRMz_KlxQ?Hfn&za|mdq05u) zdBeq)Q_K5^Bv2>%8w1kgw>TN${UP6IW!S`sYpT3WrSUQ$;z0{9wR`HD zw%N-g1#zTwBEa6~0oj_Y;=K=4L)URM{kH}})Ai?{u5=$8x2tb`Ti;1yD*{@`{X_!& zZwH#fW3UG6&@bZ7rhH(3ebBJ^!qPlEKCPYYuZLWBWjJS@ef10PrhalvO#`z|~ zDhm9#^YpNYNs8FOGqz zh(I#^i(m3->+;FqfMfEG!}tvC$7@QyG0*9Ae6Dr{;F_!a6}uHIE9zk9pYzb*U;2#1 zgVHbDtrmh+Iu+sD*?3M|0P4{tLPiOXxYpliYV^A5V&`t&nYO4r!pEyW-X91fCI&yb z6133bCyK;^qj0o#Cqc`IOh6Sq`0;*x`@Z=x^`k3SSU)Hc@?!ZfY+LlD$@_5rQf0V%us6J6OgQc?vUyl}Pg4w5epGD9cH^CQ}*RLXcW;=^Dx;`7&M zvAsy9Z0+VfO`jI)bYg30#04P#JYoUx`Sye9t}?{09HxBx##dk@gS`{iGS#EAp#KIk zZ!j0t2sYKCeZkg5om?&4hv|#6Q^@ppBa)L16Tv1Uh3(hd5o;!N#I<(Pd#;Gnlk@wKttXo07QUfKoA5uHt+20{P`tE)UF|X z>Lyy%s`?#IZH_PTa^0J&{wR0lp&%K(sj0y;#QyKo(XV@vwwtg`G|O7{M!! zP9Dp3;F$aVPM%lnit+-}a4dxE8Jw#M+Y(#bor|ezKzpkj&uguIia`QIX@aj8WnP-x zrtK{OnN+|R71!;gFT72$-S+(NPUFFL7(RdDiM9Yc-D+q3tVxAq#L4lq_h?juC?8aR zigeAjjLo&_(2Xy%AFrZAH){m`lv)DvD zw2~+_g#2)2YsA|fw>P=H>h=uDKu{ge&EvK_ljY9*I?BFZw=Jq3cukACa%!54&)4MG zBx?iGlh4k8JnVFb=FKqFz7W+Mq_d6k_+VWMtXV%lWO9IaQrf-6+KwU@*89eV@I4wW zrtOfp1r#n;c#l=@n*!83c83?l3iiM`Z zuPNaWXv-qGsOOsA`x!|~sk_%&ZR_55p`Bypo}K_AWdmC~jC18Yc$O363q{;_0~PMA zAnHD-1%z3S0RFF1?sD>OgO77gbcyiA`ziK~{v)4e3@B~V4tae4c%CtY3s9H=1*-s> zjGl=oRU?pi%xyZAGAvJ17%dnX&QuRd1369zt8|!ntf9PG{$@_jD#2^Wv;Oh=rqUJ- z{bE!tWSN(s6+uV4#%^AH3krT&RFV^z5ZC@mLX~qut^3I6_7N_Y@kpCbHxHX!mlNva z%jq6n$gKjcB_XWJV(n5HVSaZa*&IGN_)bwE-qvvjL?(Nru|`A!*55Eki_Gf+@xO&!p#NJ*8!8W-Pk(Gy}0%!ZRjm;QCdcfuc1J9y3Vy~ftM z_NokA{R?koOE>t8t9m>>&TWG$R_GZ(!#Ca!L@tjC*Fo}EAsym8W)_I1sCMlh`CpXb zAPyjm?UhK!mb1ZX9->r_^8KrsqzqRMSG#0jh5t$lpV)`;L|xoMT6n6<^QXt@aszj=+>P z9~-Thm=v`Z>Eg=?QuV-4#EtOJQ+Yad#i=8W0a#UaZ!)8hRyn&)Pt+Ah?D4i>H?Yht z9Ds5cnnwa;!QZEAH9v_4L7wNcK^!6j0e)6Tpxh-z%bGWg)=TXkz3e^S?}2AMQbxMLdtlh z(3O?9r3r(xX4#SIgJ3+5KVOO)f`(w6iTr@r8?n=E>lU5|uVC+i47tlC`vtzeGGD{D zV&`@h>F618A}6HP=@3&kLhFyl-$7V~EL@;0A@hD!kt0G2;5WIu)elr1yVIBt9O~_S zX&GmWtOZYg9*FrXY;=jDaK&7oaW=wah2oxn)tL$cRDGu8j+Y=m$p3UwV@+ z5A((_Zy$#E4ykX0UXe^~G+NFO)2_`Q9bJBK&=n7VP(cs+s#8=NbY`+A2|K|q&gsw; z$QwvTjFze~#PNAsY?9;dIo*(#tU}xVv)`xd%wNy!=_r9AL*PAT8w-C$sX=vU9$J;X zLs8iGlZ5 z#@+y1)%e9Rv90qs=<|c#;V8nzt@)9GzH!9ofH}Fx6@L*98G++{n@i20Bv}FF{CW{; zBBB9)j$Na`+;6mWM=G&hJ5}qxO|9EYAPgPpBjv`fDzOqL7b`SJpYzght^MnD#oQa& zTnft?FUDv5{eqwuQ>p9c$x4QFPkip&&1-L0>Oh%#1(awarkrrwy7-pzU~_Za-~og# zFRd5==5qkXrKP0!fBYaMZL2iK=}T*JHmPWq&c*!?DzwS`2v4}>u9q|@ex>8;-3EmLd$)+;ZtA)RIE*2;3Tn?s`EH#D%7PPweC73qmNMHqxxwb_ zI8*PnqXX^Qw--LI0%hds!!tVM6r%*%!kEOvEuU(;h6L0&I}O_)1pvK2g=mt;Ba$V~ zRd*XSpS&?nW}vD+7|i*2hhO#ND(KIoUN56jMh;b=D(L;v7jEJAa9M0WIW*%QZZ47w z!gpSMlROk4+QSRt~n*aD+e-ax9SY8wgI?bp!clLkC$l)kC0&J6;t$xD`*T5 zxYDfg)48Qyw&|PS=Hg>RQI+`}HgIHJG53>ww5hZ`@i<%H11cSKUj$^(^w;NK@$&hV zgQFc4VU;&-DzSe5pw?~oiNAs`hjXpg2q+L+al7{oiauqi`U=@xJr|Mx5hV~f+762~ zzmZLo-rEvSJ8AGrM0qS%<8o67dA=@Z6U)*7wk<&2ZGWZXzHc^~-hb}GE#7NYjawRb z0w*&sPHR*s`&`jO2B(hHaC&JOjRrU3NL6Szqu9vU5&P_?3W{9@Zk#Hx(h=`#ylSerMS789>q2^X;woh^trCkRcDZ856 zo;3!pS85At*a8unj|7;Yi+k*;{-O5601 zTIa`5dq@kT3roMNuo_Q(gR=`-%b)=+6vS#Gp6t#|!+D*zF3+XzlKAuZzkqz8S{Myv zB2HBEd3ySFLE=djQ7Z6Soz2_S&&P%VP5f4CxD-k9Ugrx7f6yz=dv3EZ-V8&I{PhhR z`3t|CfPO8Z8A*-t8gDu^*eyn3MT#>)zM!kALEz7;=r_T>ujb<}1Z7rfSfj&aR(QmLk+1-F!piyYcGA+*v zwW#bfkGu|27hR%PAB?7R(ahp-c{*3y8YUv=g1BlAGZO%*ZBU<}H&x}vDg>QJC6ekhRLoPcj773eoxUMm$3!rPxl$p8|E;k#M=;GJu zl#Hpnq2upg{PxNX@}I_%51L`Up_w+1Da4SS*^GBxB%D>P+v=b>f@J$t$}Dp8p*?j2 z_Xbd=!fWq*Fw9#(zxHYJg@anjMUyO0WKwkfxxusiIGHa;W)0|5iHg|o~?Q5?5 z&v`_hTFTAgCkYj3pGzJGS-ACaMx%h|Badh~Q-L1OyD zl=sxmS6bymv)7uIejt808g^g`&GDsKiJ`y~A$|M&H?Y-&NR3#f|MKUnXFwHdy>l;2 zbT=$dBlK%1m&%i?P#fnw2H*qBmU%t8fU#h{*kUqqDFQ5%3S7a`@D9$?`F+6LqAU&Y z5I9EyIEd%1KD~$&Q62gudbhxZx@|%@#Y#sXmBFc1dt${HTU=mzd#r(6X<_!8$fOH*OF&23 zfzGcaQ0*1}8&iR(*gKThZT9!8LA-o?<)AzLKM|WJx%}^-(dmjqOm}M@COdauzl-0i z2&6wwjQ0&pBw>nUEsSiGy?$RFyo&_2@TtEm>l0n5O`AAb!QMu!b-y`qO40Pj2~0c8 za|4@DJO5Q9!fLIWZxFx+|BVINX>!-ApN4Lv`*bkF&sIX@(nAPYrvmPJrP}R@7}?!W zW9_2|(MOO24>g-bTXd97Bj|J}xvyod zHmUronCP(!Bvwe3F8_JFvRK}7^Bx+}6me(o;x-8>!U3%ik?H_LyN1vVSjJzc90n(L zjSV6EwnZ!xhp^!20pbME<;QRo^k&usDhx5%J+Y8xXh-g4E4v-G!Tvatf-zd^pR70l zY^6GSTr|*ENptDHQ{_F+y|2hhb#1>3ylJSiXqvXT47PkcjbR|lE-_C%k0LEyUcnv- zwyojmqiq3ldWAX_Yhft*LW>zWEv7}iszncX`}7}vhj(`^+*d*DhiVEl2li=i2-9~- z4@(kmU;l7z!o%oADCCDX&bhc)ape=!8Q zgJ+2oMh>B$BnRnZk~j|N^>8r-NZFk;{bx|X@-R2PgTIo}6{Nm|M$jco<~m?s9vQ&5 zXr0^PhsByUDj6LS*BG}`&}HJ^j-p{Sz3nDIV2|RwrRG?b>>;#kEg)<7ySPT%TIjJe1W#xE;A415LhY z4iSeBP=nA7^mMHYw*;scw~eC9WqwyWm8jM&(n}9tXP6uEjBZ@yoaA8E>6}-zS=!JH zU8zjur44ND)J)2&1Lad1uvN|_ucN~%KqGnYt@Z@s^Hb09NETmuHA^?(?^C-v59PPd0$76*U(dtap(*Yo(h3#VPR=k+zW&;e(1g`H?crpROt*I~gXjF*NekSinu&`fwP-eng$> zeqSF|cJpKP_iXgwCzc^b(%7UK_0+m6&ioYp$^POzIOHJpsSqr3XfUeHkP$b-DMd!p z+e0Jt2LNYal%1{trX!YlhUPQWo&K)5I5+U9vh z7wIHC(5M^08!2DHib|$l7x72bGBK3;cAY8r1%#yYGL<z*g2P~A_>KphS)Y#yqOY7$WKv%mm?Rf6Tr@@39pbVN>R;Vj zM*aJv#?NBN%>+HiJc|+<6HVOxp4~p7sjgh=ooSYS{bHmXA2%=pq-Sbu4YkSKXH<;m z(D=!>S<(*t)JAhVI`G&$N6`uVGfDTAF&Db7btCZ)^{#)5M0@fS;z$;s8Kdzm5C_e!Xw0HfwCRjGn2BeX=2n$3Q^uZxdj9uHn}UiMRqW#B z-}zC~i(|2dvgKis&y7T;;bWM3Z+2hvL^S_tAoC!(GL+mu1J|Sq8=D=FEo8OnEw{w9 zY3UZRBw!j#lsx5#tCSh7C3n0!?s-{Kp&i&pAM|{SwJrdd;ElB9qY-+%h^q76nAruu z39L%D%l*c^hPt69j@7Aeo`$jvpBp4p4Pq7e6Voo9`%U>}eRO8wmz|+(=rWKyhJl%N zx@pX+!tqoEcP*F`@VFrZ!`A-YV3`FMs@5=5d0KIPJj;mQ05oI-}O+eN@|X9|3~aU@quGGYH8qe(Ao z%mt=3zq!A~SzzCIs7vQwEL%LVX@uc<_Uk6I!BLXj-$U@bT^{LZyHi2?_UXV&hK=5V zVZn&l4L=WdO^J=!4)|LnG=dikcC6Hir;cc5=K;Ucv^tIfp+G6Uq{(#T7!#z^wD_md z8t8mpT+AvFYrPOqaH}mihwA|(C;z)n52|GdjSnVTuNum70ADRKa7Y7{YY;2Kf|P~# zfP7if60uCPO;kZ06<2&{pQFk2CfTeHnBC_OCL)2!-_fLDa=u*~h&jq^kR9di-&01{ z1?whf(&S;XGyT>|;Ls8!$4$piLGOE60T8@Ie!|X zNxyD_{0k6-O4<9PTue}#S*BWm#d{_9RBIcda*iST)RZglVB*hK#lo;S`mQ44T`BtRn%;Ew8uAD-W3`M);^ z04Xwr{J6S4VgvCPe=FbEPc4ur2z(02P1Zq{C%_+i-yUX1aeaXKRM8T7m(Y zN6-TEWy}1^4JRXj^Y8(_-eFNH;p5&`b`N!j6Xi)l6Y7u2*K^&7?s@D9{g3938j54eOk;we8= z6Tz%#fd)-|AZuN&|gV@@$ZU1^lm?OAy?9@R=X$(lea(CsoH|EJB#<2Y>e@|tPC(S9g_ITr}oOxsE%sCnt814gm zL8R!$ECXz#(Y%>`-d_z*qkLIDoq* z>rywdPqx9bt$^md+@NcxFFNzCVS<<|hAE8E@CII6B`wa3&sN3f0TomB&}I1WL$!84 zh2_XPgD%Fhw;Bb@6c(5?2gFX`xSQk&?aS224$%Smx)X>TNP86A>=nN`k5|T9!oI5e za9rf7UrsDjhSKAK?Q32`*~P$#-3w$RaE1U9g4V`E)|r=%6)AED%zg(fEdq|q-Gr|o z&ZwlyIizJllKLR80SkXh2%-0WxF0?zOfe3L4?tU;gzMMe8bz(03PMSdq#N`AABBD|oF!I6Gcec-I5-NeUokkZ-8q zrHXFQ=pPkH*@pp9Gdl`YW04?<%b>lP3ff76+41JU7Lx2Y-Kz3GSI4-sYmM(^OIs?0 z(Sc(Ibe-MyMO@YQa$}h+Z}o{}C&}W3zZk@hp4dHh61;2RB%8V_hHnzSVyx=(N7+M%O0-3iuw=pPWb<7(?Z1z~s}Eqk|Mv~T|6PawcMbss Zfm3OUSDanc2B!=%F}SW@u6OUr{{gl=#ZUkM literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_baseline_translate_24.xml b/core/resource/src/main/res/drawable-anydpi/ic_translate_tile.xml similarity index 70% rename from app/src/main/res/drawable/ic_baseline_translate_24.xml rename to core/resource/src/main/res/drawable-anydpi/ic_translate_tile.xml index 786e172..da5f095 100644 --- a/app/src/main/res/drawable/ic_baseline_translate_24.xml +++ b/core/resource/src/main/res/drawable-anydpi/ic_translate_tile.xml @@ -1,10 +1,15 @@ + android:viewportHeight="24" + android:tint="#FFFFFF"> + + android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/> + diff --git a/core/resource/src/main/res/drawable/ic_launcher_foreground.xml b/core/resource/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..be1837a --- /dev/null +++ b/core/resource/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/core/resource/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 57% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to core/resource/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6b78462..0b0d585 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/core/resource/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,6 @@ - - + + + diff --git a/core/resource/src/main/res/values-night/ic_launcher_colors.xml b/core/resource/src/main/res/values-night/ic_launcher_colors.xml new file mode 100644 index 0000000..47bb374 --- /dev/null +++ b/core/resource/src/main/res/values-night/ic_launcher_colors.xml @@ -0,0 +1,5 @@ + + + #1C1C1E + #F2F2F7 + diff --git a/app/src/main/res/values/colors.xml b/core/resource/src/main/res/values/colors.xml similarity index 100% rename from app/src/main/res/values/colors.xml rename to core/resource/src/main/res/values/colors.xml diff --git a/core/resource/src/main/res/values/ic_launcher_colors.xml b/core/resource/src/main/res/values/ic_launcher_colors.xml new file mode 100644 index 0000000..135abc5 --- /dev/null +++ b/core/resource/src/main/res/values/ic_launcher_colors.xml @@ -0,0 +1,5 @@ + + + #F2F2F7 + #1C1C1E + diff --git a/core/resource/src/main/res/values/strings.xml b/core/resource/src/main/res/values/strings.xml new file mode 100644 index 0000000..970624b --- /dev/null +++ b/core/resource/src/main/res/values/strings.xml @@ -0,0 +1,20 @@ + + + Screen Translator + + Enable \'Screen Translator\' + Translation failed + Screen Translator + + + <p>This permission is used only for the sole purpose of letting you quickly translate your screen. The app needs this permission to:<br /></p> + <p><br />1. Collapse Notification Shade</p> + <p><br />2. Capture screen for translation</p> + <p><br /><u>Our accessibility service does neither collect nor share any data</u></p> + + Quickly translate your screen using the app! + For quick translation + + Click to open the GitHub link this app + https://github.com/vamsi3/screen-translator + diff --git a/app/src/main/res/values/themes.xml b/core/resource/src/main/res/values/themes.xml similarity index 100% rename from app/src/main/res/values/themes.xml rename to core/resource/src/main/res/values/themes.xml diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index b69c3ee..3516ec2 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -10,6 +10,7 @@ android { dependencies { implementation(project(":core:design")) implementation(project(":core:model")) + implementation(project(":core:resource")) implementation(project(":feature:settings")) api(libs.androidx.compose.foundation) diff --git a/core/ui/src/main/java/com/vamsi3/android/screentranslator/core/ui/HomeScreen.kt b/core/ui/src/main/java/com/vamsi3/android/screentranslator/core/ui/HomeScreen.kt index d18c08b..dd0ea5d 100644 --- a/core/ui/src/main/java/com/vamsi3/android/screentranslator/core/ui/HomeScreen.kt +++ b/core/ui/src/main/java/com/vamsi3/android/screentranslator/core/ui/HomeScreen.kt @@ -20,6 +20,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.vamsi3.android.screentranslator.core.data.model.ThemeMode import com.vamsi3.android.screentranslator.core.design.theme.ScreenTranslatorTheme import com.vamsi3.android.screentranslator.core.design.util.ThemePreviews +import com.vamsi3.android.screentranslator.core.resource.R import com.vamsi3.android.screentranslator.feature.settings.SettingsScreen import com.vamsi3.android.screentranslator.feature.settings.SettingsUiState import com.vamsi3.android.screentranslator.feature.settings.SettingsViewModel @@ -29,7 +30,7 @@ import com.vamsi3.android.screentranslator.feature.settings.SettingsViewModel fun HomeScreen( viewModel: SettingsViewModel = hiltViewModel() ) { - val settingsUiState by viewModel.settingsUiState.collectAsStateWithLifecycle() + val settingsUiState by viewModel.uiState.collectAsStateWithLifecycle() when (settingsUiState) { SettingsUiState.Loading -> { diff --git a/core/ui/src/main/res/values/strings.xml b/core/ui/src/main/res/values/strings.xml deleted file mode 100644 index 1f6a556..0000000 --- a/core/ui/src/main/res/values/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Screen Translator - Click to open the GitHub link this app - https://github.com/vamsi3/screen-translator - diff --git a/feature/settings/src/main/java/com/vamsi3/android/screentranslator/feature/settings/SettingsUi.kt b/feature/settings/src/main/java/com/vamsi3/android/screentranslator/feature/settings/SettingsUi.kt index b93c96e..32bff8c 100644 --- a/feature/settings/src/main/java/com/vamsi3/android/screentranslator/feature/settings/SettingsUi.kt +++ b/feature/settings/src/main/java/com/vamsi3/android/screentranslator/feature/settings/SettingsUi.kt @@ -24,7 +24,7 @@ import com.vamsi3.android.screentranslator.core.design.util.ThemePreviews fun SettingsScreen( viewModel: SettingsViewModel = hiltViewModel() ) { - val settingsUiState by viewModel.settingsUiState.collectAsStateWithLifecycle() + val settingsUiState by viewModel.uiState.collectAsStateWithLifecycle() when (settingsUiState) { SettingsUiState.Loading -> { @@ -38,8 +38,6 @@ fun SettingsScreen( settingsData = (settingsUiState as SettingsUiState.Success).settingsData, onChangeThemeMode = viewModel::setThemeMode, onChangeTranslateApp = viewModel::setTranslateApp, - onChangeUseNotificationPanelSwipeUp = viewModel::setUseNotificationPanelSwipeUp, - onChangeNotificationPanelSwipeUpDuration = viewModel::setNotificationPanelSwipeUpDuration, ) } } @@ -50,8 +48,6 @@ fun SettingsContent( settingsData: SettingsData, onChangeThemeMode: (ThemeMode) -> Unit, onChangeTranslateApp: (TranslateApp) -> Unit, - onChangeUseNotificationPanelSwipeUp: (useNotificationPanelSwipeUp: Boolean) -> Unit, - onChangeNotificationPanelSwipeUpDuration: (notificationPanelSwipeUpDuration: Long) -> Unit, ) { Column( @@ -67,12 +63,6 @@ fun SettingsContent( translateApp = settingsData.translateApp, onChangeTranslateApp = onChangeTranslateApp ) - NotificationPanelSwipeUpSetting( - settingsData.useNotificationPanelSwipeUp, - onChangeUseNotificationPanelSwipeUp, - settingsData.notificationPanelSwipeUpDuration, - onChangeNotificationPanelSwipeUpDuration - ) } } @@ -170,11 +160,11 @@ fun TranslateAppSetting( @ExperimentalMaterial3Api @Composable -fun TranslateAppDialog( +fun ThemeModeDialog( openDialog: Boolean, setOpenDialog: (Boolean) -> Unit, - translateApp: TranslateApp, - onChangeTranslateApp: (TranslateApp) -> Unit, + themeMode: ThemeMode, + onChangeThemeMode: (ThemeMode) -> Unit, ) { if (openDialog) { AlertDialog( @@ -184,31 +174,31 @@ fun TranslateAppDialog( setOpenDialog(false) }, title = { - Text(text = "Translate App") + Text(text = "Theme") }, text = { Column( modifier = Modifier.selectableGroup().padding(start = 16.dp, top = 16.dp), verticalArrangement = Arrangement.spacedBy(32.dp) ) { - TranslateApp.values().forEach { translateAppOption -> + ThemeMode.values().forEach { themeModeOption -> Row( Modifier .fillMaxWidth() .selectable( - selected = (translateAppOption == translateApp), - onClick = { onChangeTranslateApp(translateAppOption) }, + selected = (themeModeOption == themeMode), + onClick = { onChangeThemeMode(themeModeOption) }, role = Role.RadioButton ), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(16.dp) ) { RadioButton( - selected = (translateAppOption == translateApp), + selected = (themeModeOption == themeMode), onClick = null ) Text( - text = translateAppOption.appName, + text = themeModeOption.modeName, style = MaterialTheme.typography.bodyLarge ) } @@ -222,11 +212,11 @@ fun TranslateAppDialog( @ExperimentalMaterial3Api @Composable -fun ThemeModeDialog( +fun TranslateAppDialog( openDialog: Boolean, setOpenDialog: (Boolean) -> Unit, - themeMode: ThemeMode, - onChangeThemeMode: (ThemeMode) -> Unit, + translateApp: TranslateApp, + onChangeTranslateApp: (TranslateApp) -> Unit, ) { if (openDialog) { AlertDialog( @@ -236,31 +226,31 @@ fun ThemeModeDialog( setOpenDialog(false) }, title = { - Text(text = "Theme") + Text(text = "Translate App") }, text = { Column( modifier = Modifier.selectableGroup().padding(start = 16.dp, top = 16.dp), verticalArrangement = Arrangement.spacedBy(32.dp) ) { - ThemeMode.values().forEach { themeModeOption -> + TranslateApp.values().forEach { translateAppOption -> Row( Modifier .fillMaxWidth() .selectable( - selected = (themeModeOption == themeMode), - onClick = { onChangeThemeMode(themeModeOption) }, + selected = (translateAppOption == translateApp), + onClick = { onChangeTranslateApp(translateAppOption) }, role = Role.RadioButton ), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(16.dp) ) { RadioButton( - selected = (themeModeOption == themeMode), + selected = (translateAppOption == translateApp), onClick = null ) Text( - text = themeModeOption.modeName, + text = translateAppOption.appName, style = MaterialTheme.typography.bodyLarge ) } @@ -272,100 +262,6 @@ fun ThemeModeDialog( } } - -@Composable -fun NotificationPanelSwipeUpSetting( - useNotificationPanelSwipeUp: Boolean, - onChangeUseNotificationPanelSwipeUp: (useNotificationPanelSwipeUp: Boolean) -> Unit, - notificationPanelSwipeUpDuration: Long, - onChangeNotificationPanelSwipeUpDuration: (notificationPanelSwipeUpDuration: Long) -> Unit, -) { - Surface( - modifier = Modifier - .padding(8.dp) - .fillMaxWidth(), - tonalElevation = 4.dp, - shadowElevation = 8.dp, - shape = RoundedCornerShape(8.dp), - ) { - Column( - - ) { - var notificationPanelSwipeUpDurationState by remember { mutableStateOf(notificationPanelSwipeUpDuration) } - - Row( - modifier = Modifier - .padding(start = 16.dp, top = 8.dp, end = 16.dp) - .fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.SpaceBetween, - ) { - Text("Notification Panel Swipe", style = MaterialTheme.typography.titleMedium) - Switch( - modifier = Modifier.padding(0.dp), - checked = useNotificationPanelSwipeUp, - onCheckedChange = onChangeUseNotificationPanelSwipeUp, - ) - } - Row( - modifier = Modifier - .padding(start = 16.dp, top = 8.dp, bottom = 8.dp) - .fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.SpaceBetween, - ) { - Slider( - value = notificationPanelSwipeUpDurationState.toFloat(), - onValueChange = { notificationPanelSwipeUpDurationState = it.toLong() }, - onValueChangeFinished = { onChangeNotificationPanelSwipeUpDuration(notificationPanelSwipeUpDurationState) }, - valueRange = 100f..1000f, - steps = 8, - modifier = Modifier - .padding(vertical = 16.dp) - .fillMaxWidth(0.6f), - enabled = useNotificationPanelSwipeUp - ) - if (useNotificationPanelSwipeUp) { - Button( - onClick = {}, - shape = RoundedCornerShape(8.dp), - modifier = Modifier - .padding(horizontal = 16.dp, vertical = 4.dp) - .height(48.dp), - ) { - Text("$notificationPanelSwipeUpDurationState ms") - } - } - -// Surface( -// color = MaterialTheme.colorScheme.primary, -// shape = RoundedCornerShape(8.dp), -//// modifier = Modifier -//// .padding(horizontal = 24.dp, vertical = 8.dp) -//// .height(48.dp), -// ) { -// Box( -//// modifier = Modifier -//// .padding(horizontal = 4.dp, vertical = 4.dp) -//// .width(96.dp) -//// .height(48.dp), -// contentAlignment = Alignment.Center -// ) { -// if (useNotificationPanelSwipeUp) { -// Text( -// text = "$notificationPanelSwipeUpDurationState ms", -// modifier = Modifier -// .padding(horizontal = 24.dp, vertical = 16.dp) -// ) -// } -// } -// } - } - } - - } -} - @ThemePreviews @Composable private fun SettingsPreview() { @@ -375,13 +271,9 @@ private fun SettingsPreview() { settingsData = SettingsData( themeMode = ThemeMode.SYSTEM, translateApp = TranslateApp.GOOGLE_LENS, - useNotificationPanelSwipeUp = true, - notificationPanelSwipeUpDuration = 300, ), onChangeThemeMode = { }, onChangeTranslateApp = { }, - onChangeUseNotificationPanelSwipeUp = { }, - onChangeNotificationPanelSwipeUpDuration = { }, ) } } diff --git a/feature/settings/src/main/java/com/vamsi3/android/screentranslator/feature/settings/SettingsViewModel.kt b/feature/settings/src/main/java/com/vamsi3/android/screentranslator/feature/settings/SettingsViewModel.kt index c4b94c0..096ddc1 100644 --- a/feature/settings/src/main/java/com/vamsi3/android/screentranslator/feature/settings/SettingsViewModel.kt +++ b/feature/settings/src/main/java/com/vamsi3/android/screentranslator/feature/settings/SettingsViewModel.kt @@ -12,42 +12,27 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch import javax.inject.Inject -import kotlin.time.Duration.Companion.milliseconds @HiltViewModel class SettingsViewModel @Inject constructor( private val userDataRepository: UserDataRepository, ) : ViewModel() { - val settingsUiState: StateFlow = + val uiState: StateFlow = userDataRepository.userData .map { userData -> SettingsUiState.Success( settingsData = SettingsData( themeMode = userData.themeMode, translateApp = userData.translateApp, - useNotificationPanelSwipeUp = userData.useNotificationPanelSwipeUp, - notificationPanelSwipeUpDuration = userData.notificationPanelSwipeUpDuration.inWholeMilliseconds, ) ) } .stateIn( scope = viewModelScope, - started = SharingStarted.Eagerly, + started = SharingStarted.WhileSubscribed(5_000), initialValue = SettingsUiState.Loading ) - fun setUseNotificationPanelSwipeUp(useNotificationPanelSwipeUp: Boolean) { - viewModelScope.launch { - userDataRepository.setUseNotificationPanelSwipeUp(useNotificationPanelSwipeUp) - } - } - - fun setNotificationPanelSwipeUpDuration(notificationPanelSwipeUpDuration: Long) { - viewModelScope.launch { - userDataRepository.setNotificationPanelSwipeUpDuration(notificationPanelSwipeUpDuration.milliseconds) - } - } - fun setThemeMode(themeMode: ThemeMode) { viewModelScope.launch { userDataRepository.setThemeMode(themeMode) @@ -63,8 +48,6 @@ class SettingsViewModel @Inject constructor( data class SettingsData( val themeMode: ThemeMode, - val useNotificationPanelSwipeUp: Boolean, - val notificationPanelSwipeUpDuration: Long, val translateApp: TranslateApp, ) diff --git a/feature/translate/build.gradle.kts b/feature/translate/build.gradle.kts index 316b522..a0060b5 100644 --- a/feature/translate/build.gradle.kts +++ b/feature/translate/build.gradle.kts @@ -11,6 +11,7 @@ android { dependencies { implementation(project(":core:data")) implementation(project(":core:model")) + implementation(project(":core:resource")) implementation(libs.androidx.core.ktx) implementation(libs.androidx.hilt.navigation.compose) } diff --git a/feature/translate/src/main/java/com/vamsi3/android/screentranslator/feature/translate/ScreenTranslatorAccessibilityService.kt b/feature/translate/src/main/java/com/vamsi3/android/screentranslator/feature/translate/ScreenTranslatorAccessibilityService.kt index 56f4d8e..eae980d 100644 --- a/feature/translate/src/main/java/com/vamsi3/android/screentranslator/feature/translate/ScreenTranslatorAccessibilityService.kt +++ b/feature/translate/src/main/java/com/vamsi3/android/screentranslator/feature/translate/ScreenTranslatorAccessibilityService.kt @@ -1,23 +1,27 @@ package com.vamsi3.android.screentranslator.feature.translate import android.accessibilityservice.AccessibilityService -import android.accessibilityservice.GestureDescription +import android.accessibilityservice.AccessibilityServiceInfo import android.content.ActivityNotFoundException import android.content.Intent import android.graphics.Bitmap -import android.graphics.Path +import android.net.Uri +import android.os.Build import android.provider.Settings import android.view.Display import android.view.accessibility.AccessibilityEvent import android.widget.Toast import androidx.core.content.FileProvider +import com.vamsi3.android.screentranslator.core.data.model.TranslateApp import com.vamsi3.android.screentranslator.core.data.repository.UserDataRepository +import com.vamsi3.android.screentranslator.core.resource.R import dagger.hilt.android.AndroidEntryPoint import java.io.File import java.io.FileOutputStream import javax.inject.Inject const val FILE_PROVIDER_AUTHORITY = "com.vamsi3.android.screentranslator.fileProvider" +const val PACKAGE_ANDROID_SYSTEM_UI = "com.android.systemui" const val MIME_TYPE_JPEG = "image/jpeg" const val SCREENSHOT_FILE_NAME = "screenshot.jpg" @@ -27,69 +31,74 @@ class ScreenTranslatorAccessibilityService : AccessibilityService() { @Inject lateinit var userDataRepository: UserDataRepository - override fun onAccessibilityEvent(event: AccessibilityEvent?) {} - - override fun onInterrupt() { - stopSelf() - } - override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int { - swipeUpAndTakeScreenshot() + translateScreen() stopSelf(startId) return START_NOT_STICKY } - private fun swipeUpAndTakeScreenshot() { - if (!isScreenTranslatorAccessibilityServiceEnabled(application)) { - redirectToAccessibilitySettings() - return - } - - val userData = userDataRepository.userData.value - val useNotificationPanelSwipeUp = userData.useNotificationPanelSwipeUp - val notificationPanelSwipeUpDuration = userData.notificationPanelSwipeUpDuration - .inWholeMilliseconds.let { if (it <= 0L) 300L else it } + override fun onInterrupt() { + stopSelf() + } - if (!useNotificationPanelSwipeUp) { - takeScreenshotAndRedirectToTranslateApp() - return - } + override fun onAccessibilityEvent(event: AccessibilityEvent?) { + if (event == null) return - val path = Path().apply { - val midX: Float = resources.displayMetrics.widthPixels * .5F - val bottomY: Float = resources.displayMetrics.heightPixels * .95F - val topY: Float = resources.displayMetrics.heightPixels * .05F + disableEvents() - moveTo(midX, bottomY) - lineTo(midX, topY) + if (event.packageName.equals(PACKAGE_ANDROID_SYSTEM_UI) && + event.text.any { it.contains("Notification shade") } + ) { + takeScreenshotAndTranslate() } + } - val gestureDescription = - GestureDescription.Builder() - .addStroke(GestureDescription.StrokeDescription(path, 0, notificationPanelSwipeUpDuration)) - .build() - - dispatchGesture(gestureDescription, object : GestureResultCallback() { - override fun onCompleted(gestureDescription: GestureDescription?) { - super.onCompleted(gestureDescription) - takeScreenshotAndRedirectToTranslateApp() + private fun translateScreen() { + when { + !isScreenTranslatorAccessibilityServiceEnabled(application) -> { + dismissNotificationShade() + startActivity( + Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + ) + showToast(R.string.enable_screen_translator) + } + else -> { + enableWindowStateChangedEvents() + dismissNotificationShade() } + } + } - override fun onCancelled(gestureDescription: GestureDescription?) { - super.onCancelled(gestureDescription) - showToast(R.string.translation_failed) + private fun dismissNotificationShade() { + when { + Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + performGlobalAction(GLOBAL_ACTION_DISMISS_NOTIFICATION_SHADE) } - }, null) + else -> { + val intent = Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS) + applicationContext.sendBroadcast(intent) + } + } + } + + private fun enableWindowStateChangedEvents() { + serviceInfo = serviceInfo.apply { + eventTypes = AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED + packageNames = arrayOf(PACKAGE_ANDROID_SYSTEM_UI) + flags = AccessibilityServiceInfo.DEFAULT + } } - private fun redirectToAccessibilitySettings() { - val intent = - Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - startActivity(intent) - showToast(R.string.enable_screen_translator) + private fun disableEvents() { + serviceInfo = serviceInfo.apply { + eventTypes = 0 + packageNames = null + flags = 0 + } } - private fun takeScreenshotAndRedirectToTranslateApp() { + private fun takeScreenshotAndTranslate() { takeScreenshot( Display.DEFAULT_DISPLAY, application.mainExecutor, @@ -105,7 +114,7 @@ class ScreenTranslatorAccessibilityService : AccessibilityService() { } val file = writeBitmapToFile(bitmap) - redirectToTranslateApp(file) + forwardScreenshotToTranslateApp(file) } override fun onFailure(i: Int) { @@ -126,7 +135,7 @@ class ScreenTranslatorAccessibilityService : AccessibilityService() { return file } - private fun redirectToTranslateApp(file: File) { + private fun forwardScreenshotToTranslateApp(file: File) { val translateApp = userDataRepository.userData.value.translateApp val uri = FileProvider.getUriForFile( @@ -153,25 +162,43 @@ class ScreenTranslatorAccessibilityService : AccessibilityService() { try { startActivity(intent) } catch (e: ActivityNotFoundException) { -// try { -// val intent = Intent( -// this, -// Class.forName("com.vamsi3.android.screentranslator.MainActivity") -// ) -// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) -// startActivity(intent) -// } catch (e: ClassNotFoundException) { -// e.printStackTrace() -// } - showToast("${translateApp.appName} app not found") + suggestTranslateAppInstallation(translateApp) + } + } + + private fun suggestTranslateAppInstallation(translateApp: TranslateApp) { + showToast("Please install ${translateApp.appName}") + + val intent = Intent(Intent.ACTION_VIEW).apply { + flags = Intent.FLAG_ACTIVITY_NEW_TASK + } + + try { + startActivity(intent.apply { + data = Uri.parse("https://play.google.com/store/apps/details?id=${translateApp.packageName}") + `package` = "com.android.vending" + }) + } catch (e: ActivityNotFoundException) { + try { + startActivity(intent.apply { + data = Uri.parse("market://details?id=${translateApp.packageName}") + `package` = null + }) + } catch (e: ActivityNotFoundException) { + startActivity(intent.apply { + data = Uri.parse("https://play.google.com/store/apps/details?id=${translateApp.packageName}") + `package` = null + }) + } } } private fun showToast(resourceId: Int) { - Toast.makeText(application, resourceId, Toast.LENGTH_SHORT).show() + Toast.makeText(application, resourceId, Toast.LENGTH_LONG).show() } private fun showToast(message: String) { - Toast.makeText(application, message, Toast.LENGTH_SHORT).show() + Toast.makeText(application, message, Toast.LENGTH_LONG).show() } + } diff --git a/feature/translate/src/main/java/com/vamsi3/android/screentranslator/feature/translate/ScreenTranslatorTileService.kt b/feature/translate/src/main/java/com/vamsi3/android/screentranslator/feature/translate/ScreenTranslatorTileService.kt index f027465..9ac47d2 100644 --- a/feature/translate/src/main/java/com/vamsi3/android/screentranslator/feature/translate/ScreenTranslatorTileService.kt +++ b/feature/translate/src/main/java/com/vamsi3/android/screentranslator/feature/translate/ScreenTranslatorTileService.kt @@ -6,7 +6,6 @@ import android.service.quicksettings.TileService class ScreenTranslatorTileService : TileService() { override fun onClick() { - super.onClick() val accessibilityPermissionGranted = isScreenTranslatorAccessibilityServiceEnabled(application) diff --git a/feature/translate/src/main/java/com/vamsi3/android/screentranslator/feature/translate/Utils.kt b/feature/translate/src/main/java/com/vamsi3/android/screentranslator/feature/translate/Utils.kt index ab772bd..1650925 100644 --- a/feature/translate/src/main/java/com/vamsi3/android/screentranslator/feature/translate/Utils.kt +++ b/feature/translate/src/main/java/com/vamsi3/android/screentranslator/feature/translate/Utils.kt @@ -2,7 +2,9 @@ package com.vamsi3.android.screentranslator.feature.translate import android.app.Application import android.content.ComponentName +import android.os.Build import android.provider.Settings +import androidx.annotation.RequiresApi internal fun isScreenTranslatorAccessibilityServiceEnabled( application: Application, diff --git a/feature/translate/src/main/res/values/strings.xml b/feature/translate/src/main/res/values/strings.xml deleted file mode 100644 index 7fa6d04..0000000 --- a/feature/translate/src/main/res/values/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Translate your screen using Translate Apps of your choice - Enable \'Screen Translator\' - Translation failed - diff --git a/feature/translate/src/main/res/xml-v33/accessibility_service_config.xml b/feature/translate/src/main/res/xml-v33/accessibility_service_config.xml new file mode 100644 index 0000000..50ffa00 --- /dev/null +++ b/feature/translate/src/main/res/xml-v33/accessibility_service_config.xml @@ -0,0 +1,8 @@ + + diff --git a/feature/translate/src/main/res/xml/accessibility_service_config.xml b/feature/translate/src/main/res/xml/accessibility_service_config.xml new file mode 100644 index 0000000..06ad89d --- /dev/null +++ b/feature/translate/src/main/res/xml/accessibility_service_config.xml @@ -0,0 +1,7 @@ + + diff --git a/app/src/main/res/xml/filepaths.xml b/feature/translate/src/main/res/xml/filepaths.xml similarity index 100% rename from app/src/main/res/xml/filepaths.xml rename to feature/translate/src/main/res/xml/filepaths.xml diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b77eff2..6b6d555 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,8 @@ androidxAppCompat = "1.5.1" androidxComposeBom = "2023.01.00" androidxComposeCompiler = "1.3.2" -androidxCore = "1.9.0" +androidxCoreKtx = "1.9.0" +androidxCoreSplashScreen = "1.0.0" androidxDataStore = "1.0.0" androidDesugarJdkLibs = "1.2.2" androidGradlePlugin = "7.4.1" @@ -20,13 +21,15 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" } androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" } androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" } +androidx-compose-material-icons = { group = "androidx.compose.material", name = "material-icons-core" } androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" } androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" } androidx-compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata" } androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } androidx-compose-ui-util = { group = "androidx.compose.ui", name = "ui-util" } -androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" } +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCoreKtx" } +androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "androidxCoreSplashScreen" } androidx-dataStore-core = { group = "androidx.datastore", name = "datastore", version.ref = "androidxDataStore" } androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } androidx-lifecycle-runtimeCompose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidxLifecycle" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 6f6a43f..efd4231 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -21,5 +21,6 @@ include(":core:data") include(":core:design") include(":core:ui") include(":core:model") +include(":core:resource") include(":feature:settings") include(":feature:translate")