From e264e43d69f97d82c7d88a5a40aa5861e2c6ba07 Mon Sep 17 00:00:00 2001 From: yuval Date: Fri, 25 Jul 2025 23:34:17 +0300 Subject: [PATCH 01/56] GA-122 set up the project --- android_app/.gitignore | 15 ++ android_app/app/.gitignore | 1 + android_app/app/build.gradle | 50 +++++ android_app/app/proguard-rules.pro | 21 ++ .../android_app/ExampleInstrumentedTest.java | 26 +++ android_app/app/src/main/AndroidManifest.xml | 31 +++ .../com/asp/android_app/InboxActivity.java | 17 ++ .../com/asp/android_app/MainActivity.java | 18 ++ .../res/drawable/ic_launcher_background.xml | 170 ++++++++++++++++ .../res/drawable/ic_launcher_foreground.xml | 30 +++ .../src/main/res/layout/activity_inbox.xml | 10 + .../app/src/main/res/layout/activity_main.xml | 13 ++ .../app/src/main/res/layout/drawer_header.xml | 14 ++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 6 + .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes .../app/src/main/res/values-night/themes.xml | 21 ++ .../app/src/main/res/values/colors.xml | 10 + .../app/src/main/res/values/strings.xml | 12 ++ .../app/src/main/res/values/themes.xml | 21 ++ .../app/src/main/res/xml/backup_rules.xml | 13 ++ .../main/res/xml/data_extraction_rules.xml | 19 ++ .../com/asp/android_app/ExampleUnitTest.java | 17 ++ android_app/build.gradle | 4 + android_app/gradle.properties | 23 +++ android_app/gradle/libs.versions.toml | 42 ++++ android_app/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + android_app/gradlew | 185 ++++++++++++++++++ android_app/gradlew.bat | 89 +++++++++ android_app/settings.gradle | 23 +++ 40 files changed, 913 insertions(+) create mode 100644 android_app/.gitignore create mode 100644 android_app/app/.gitignore create mode 100644 android_app/app/build.gradle create mode 100644 android_app/app/proguard-rules.pro create mode 100644 android_app/app/src/androidTest/java/com/asp/android_app/ExampleInstrumentedTest.java create mode 100644 android_app/app/src/main/AndroidManifest.xml create mode 100644 android_app/app/src/main/java/com/asp/android_app/InboxActivity.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/MainActivity.java create mode 100644 android_app/app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 android_app/app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 android_app/app/src/main/res/layout/activity_inbox.xml create mode 100644 android_app/app/src/main/res/layout/activity_main.xml create mode 100644 android_app/app/src/main/res/layout/drawer_header.xml create mode 100644 android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 android_app/app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 android_app/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 android_app/app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 android_app/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 android_app/app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 android_app/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 android_app/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 android_app/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 android_app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 android_app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 android_app/app/src/main/res/values-night/themes.xml create mode 100644 android_app/app/src/main/res/values/colors.xml create mode 100644 android_app/app/src/main/res/values/strings.xml create mode 100644 android_app/app/src/main/res/values/themes.xml create mode 100644 android_app/app/src/main/res/xml/backup_rules.xml create mode 100644 android_app/app/src/main/res/xml/data_extraction_rules.xml create mode 100644 android_app/app/src/test/java/com/asp/android_app/ExampleUnitTest.java create mode 100644 android_app/build.gradle create mode 100644 android_app/gradle.properties create mode 100644 android_app/gradle/libs.versions.toml create mode 100644 android_app/gradle/wrapper/gradle-wrapper.jar create mode 100644 android_app/gradle/wrapper/gradle-wrapper.properties create mode 100755 android_app/gradlew create mode 100644 android_app/gradlew.bat create mode 100644 android_app/settings.gradle diff --git a/android_app/.gitignore b/android_app/.gitignore new file mode 100644 index 00000000..aa724b77 --- /dev/null +++ b/android_app/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/android_app/app/.gitignore b/android_app/app/.gitignore new file mode 100644 index 00000000..42afabfd --- /dev/null +++ b/android_app/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle new file mode 100644 index 00000000..f5654048 --- /dev/null +++ b/android_app/app/build.gradle @@ -0,0 +1,50 @@ +plugins { + alias(libs.plugins.android.application) +} + +android { + namespace 'com.asp.android_app' + compileSdk 35 + + defaultConfig { + applicationId "com.asp.android_app" + minSdk 24 + targetSdk 35 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + buildConfigField "String", "API_BASE_URL", "\"${API_BASE_URL}\"" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 + } +} + +dependencies { + implementation libs.appcompat + implementation libs.material + implementation libs.constraintlayout + implementation libs.navigation.fragment + implementation libs.navigation.ui + implementation libs.activity + testImplementation libs.junit + androidTestImplementation libs.ext.junit + androidTestImplementation libs.espresso.core + // Retrofit & Gson + implementation libs.retrofit + implementation libs.gson.converter + // Lifecycle ViewModel + LiveData + implementation libs.lifecycle.viewmodel + implementation libs.lifecycle.livedata + // Room + implementation libs.room.runtime + annotationProcessor libs.room.compiler +} \ No newline at end of file diff --git a/android_app/app/proguard-rules.pro b/android_app/app/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/android_app/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/android_app/app/src/androidTest/java/com/asp/android_app/ExampleInstrumentedTest.java b/android_app/app/src/androidTest/java/com/asp/android_app/ExampleInstrumentedTest.java new file mode 100644 index 00000000..470e37b6 --- /dev/null +++ b/android_app/app/src/androidTest/java/com/asp/android_app/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.asp.android_app; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + assertEquals("com.asp.android_app", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/android_app/app/src/main/AndroidManifest.xml b/android_app/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..eb05342f --- /dev/null +++ b/android_app/app/src/main/AndroidManifest.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/InboxActivity.java b/android_app/app/src/main/java/com/asp/android_app/InboxActivity.java new file mode 100644 index 00000000..07055d54 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/InboxActivity.java @@ -0,0 +1,17 @@ +package com.asp.android_app; + +import android.os.Bundle; + +import androidx.appcompat.app.AppCompatActivity; + +public class InboxActivity extends AppCompatActivity { + + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_inbox); + } + +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/MainActivity.java b/android_app/app/src/main/java/com/asp/android_app/MainActivity.java new file mode 100644 index 00000000..a9572ec0 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/MainActivity.java @@ -0,0 +1,18 @@ +package com.asp.android_app; + +import android.os.Bundle; + +import androidx.appcompat.app.AppCompatActivity; + +public class MainActivity extends AppCompatActivity { + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + + } + +} \ No newline at end of file diff --git a/android_app/app/src/main/res/drawable/ic_launcher_background.xml b/android_app/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..07d5da9c --- /dev/null +++ b/android_app/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android_app/app/src/main/res/drawable/ic_launcher_foreground.xml b/android_app/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..2b068d11 --- /dev/null +++ b/android_app/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/layout/activity_inbox.xml b/android_app/app/src/main/res/layout/activity_inbox.xml new file mode 100644 index 00000000..ef8c813c --- /dev/null +++ b/android_app/app/src/main/res/layout/activity_inbox.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/layout/activity_main.xml b/android_app/app/src/main/res/layout/activity_main.xml new file mode 100644 index 00000000..93df62f0 --- /dev/null +++ b/android_app/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/layout/drawer_header.xml b/android_app/app/src/main/res/layout/drawer_header.xml new file mode 100644 index 00000000..5dd077ad --- /dev/null +++ b/android_app/app/src/main/res/layout/drawer_header.xml @@ -0,0 +1,14 @@ + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..6f3b755b --- /dev/null +++ b/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..6f3b755b --- /dev/null +++ b/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/android_app/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/android_app/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/android_app/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/android_app/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/android_app/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/android_app/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/android_app/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch 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? literal 0 HcmV?d00001 diff --git a/android_app/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/android_app/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 zcmV-U53%r4Nk&FS4*&pHMM6+kP&il$0000G0001A003VA06|PpNSy@$00HoY|G(*G z+qV7x14$dSO^Re!iqt-AAIE9iwr$(CZQJL$blA4B`>;C3fBY6Q8_YSjb2%a=fc}4E zrSzssacq<^nmW|Rs93PJni30R<8w<(bK_$LO4L?!_OxLl$}K$MUEllnMK|rg=f3;y z*?;3j|Nh>)p0JQ3A~rf(MibH2r+)3cyV1qF&;8m{w-S*y+0mM){KTK^M5}ksc`qX3 zy>rf^b>~l>SSHds8(I@hz3&PD@LmEs4&prkT=BjsBCXTMhN$_)+kvnl0bLKW5rEsj z*d#KXGDB4P&>etx0X+`R19yC=LS)j!mgs5M0L~+o-T~Jl!p!AJxnGAhV%~rhYUL4hlWhgES3Kb5oA&X z{}?3OBSS-{!v$nCIGj->(-TAG)8LR{htr41^gxsT8yqt2@DEG6Yl`Uma3Nd4;YUoW zTbkYl3CMU5ypMF3EIkYmWL|*BknM`0+Kq6CpvO(y$#j94e+q{vI{Zp8cV_6RK!`&C zob$*5Q|$IZ09dW=L!V zw@#2wviu|<#3lgGE8GEhcx+zBt`} zOwP8j9X%^f7i_bth4PiJ$LYtFJSCN$3xwDN;8mr*B;CJwBP2G0TMq0uNt7S^DO_wE zepk!Wrn#Z#03j{`c*Rf~y3o7?J}w?tEELRUR2cgxB*Y{LzA#pxHgf}q?u5idu>077 zd^=p)`nA}6e`|@`p?u}YU66PP_MA}Zqqe!c{nK&z%Jwq1N4e_q<#4g^xaz=ao;u|6 zwpRcW2Lax=ZGbx=Q*HhlJ`Ns#Y*r0*%!T?P*TTiX;rb)$CGLz=rSUum$)3Qyv{BL2 zO*=OI2|%(Yz~`pNEOnLp>+?T@glq-DujlIp?hdJeZ7ctP4_OKx|5@EOps3rr(pWzg zK4d3&oN-X2qN(d_MkfwB4I)_)!I_6nj2iA9u^pQ{;GckGLxBGrJUM2Wdda!k)Y>lq zmjws>dVQ*vW9lvEMkiN3wE-__6OWD0txS&Qn0n22cyj4Q*8(nG4!G{6OOwNvsrPIL zCl-$W9UwkEUVuLwyD%|inbOF*xMODZ4VMEVAq_zUxZ+K#Gdqf!DW$5f)?7UNOFMz! zrB~tuu=6X2FE(p^iqgxr+?ZK;=yz`e;C$#_@D9Lj-+TDVOrva>(#*PVbaHO>A)mhl z07OJWCqYC60518$!&c`eNBcBW%GnfaQ*$eazV^2_AW?j)h;J1nUjN(I9=0+!RVx~% z3@Tf!P0TE+98jA?WceK-}A1% zW!K)lyKcGqy#M~})315-A#2NXQ`?6NR#Apo=S!oF=JfpX>iR*49ec{7AN$xxpK{D$ z2d%Fz&rdfSqourN$~Y^NFIMV1CZ?J*bMx~H3k&meGtH@q9ra2vZxmA$S(#jaaj-g4 ztJmxG+DLV<*q<|sDXPp$X>E)#S}Vm&sRaO5P&goh2><}FEdZSXDqsL$06sAkh(e+v zAsBhKSRexgwg6tIy~GFJzaTxXD(}|+0eOwFDA%rn`X;MVwDHT9=4=g%OaJ9s%3b9>9EUTnnp0t;2Zpa{*>mk~hZqItE_!dQ zOtC>8`$l|mV43Jbudf0N6&&X;{=z}Zi}d1`2qmJ}i|0*GsulD3>GgQXHN)pkR6sf1 z?5ZU%&xtL}oH;YiAA)d*^Ndw2T$+Mjuzyzz@-SM`9df7LqTxLuIwC~S0092~+=qYv z@*ja;?Wt!T!{U?c*Z0YtGe)XbI&y-?B&G2$`JDM)(dIV9G`Sc#6?sI60de6kv+)Qb zUW~2|WjvJq3TA8`0+sWA3zRhY9a~ow)O~&StBkG2{*{TGiY~S8ep{V&Vo2l<6LWsu z^#p0-v*t2?3&aA1)ozu|%efSR=XnpX$lvTeRdKlvM!@|pM5p2w3u-6 zU>}t2xiYLS+{|%C65AzX+23Mtlq?BS&YdYcYsVjoiE&rT>;Necn6l^K)T^lmE`5u{ zm1i+-a-gc;Z&v-{;8r)z6NYfBUv+=_L}ef}qa9FX01)+Aaf+;xj(mL6|JUzGJR1|fnanb%?BPPIp>SCjP|8qE5qJ{=n5ZGw?81z3(k;pzH%1CtlX50{E7h)$h{qGKfzC`e2o`*IqA#tjA z`Fz&^%$b9F*N`)U-#6>a)Z`55`$Dd0cfcs0$d13^ONrdCu9xcv_=n#WQo8stcz3jP9|2EvdI-RhJM3%Q%oM&!OlShM|0 z?gz?wHZSnm45njLtsz8PVT1S&jAlbKg5kVam$p16=EK@Sj4EP0OtH zmJDmdc^v)x>56Qg_wmYHz6h)>kl_h$>0@J!ypv%APmjZTAQVLy6Fu50RGY&JAVNhx zrF_qG6`x9MkT;1SFWo$)l{M$;3qUDn9JwE}z zRl#E_bDRJFii61kPgBybIgp8dNW!Cc1b*^YYk-#oWLJvtM_v^hQx~9?8LD4VFFxBF z3MlrsSC%f9Oupn*ctPL0U1fwfX?`tRhPD{PSLFPQOmIt$mDy0SgpNVvHS+f#Do>h1Gn?LZU9(KaN>Q_=Y*_T zvtD7%_u^^+{g`0VGzg(VZrpVQ6Ub5M=tI_p7T93R8@3Zulu3|#{iNcu!oiHxZ4Rf*( zfmiN$$ru(*_Zqn=`Gq#OuHRTSwp7uH_SokR&|)RuW5yo=Z|_4?qU-JU+tpt>!B&Is z@N(=SG;bpVc;AO@zbmMM zScqq1)b-ZQIrs={oD}|?6y{$HNB1U0^LsBh8JI&3!GBZxOXI<}&5-$lgkAaYqhOTb z?2vEnZ$-kk;*M_17(upJF3%+iH*s0-r{vttXVB2OUwI1s^+G(Ft(U8gYFXC}#P&E^ z>T@C^tS`Z7{6HT4_nF~n>JlZtk5&qDBl6r|^kzQYe`wq!C)n@$c>WOPA61NDFj<<6 zGW71NMMhwAl!U-yqrq2xrSFqRCI8acw7?}3j;ynxo*-b7Co;g5r%^j=H@9({PXXBf z@r>U>>N;E)81wx`B4f%{PB~MHka_);%kBCb(d|Jy5!MqJ%2p`t&@L)4$T2j&-WHvG zv3(uyA_gwqNu(k?jQTtv3dgPKRZoH8prxe7>pQBW5L&dpumS&5Ld2?(sCpJjvc4L5 zEnh&?91WVm)ZdTj=fjJ$pPDdgAttLXuke+?KdKxu*;kTC(r!tQk6;gxj4h%FdHAt(^M3YvYj(!tOeN)+Hvj6+< zzyJRG?^lZfWuR#t!tUKP&(?%3v&Zd$R2YN>lB(Lq`OInY48%4%yTv2 zYe1{G`3)(PDEio5Y@-I5tUf`c%%OCJMtSW56g3iEg%3`$7XSJJHyA z<|7&N)5Xrlgv~%BO24eFd;Hd;uiK%D`EdK|quUeRZDqbh9l)%j%J#0lfrZumvA<_w zu&=AVvdChf6}eqh(bUz`(`Ue*p01{fBAcTgKyDYLs_I+YyJEk+rM@avU~>fB$n)HS zM7pfJydu`i%gfS<{PF94kZDv$t>06sAkheDzu40NJ$5CMW%n^Lls?8^p^QGWURbKu3ZduZQZ((s2? zzE`}<{;Zt7<$C|9R8A~DJ~@%x>TfP zF>TX8)@v|t)q4GjRt<}5s6hLHwRel7>V@&r-O|Av(yh;Q1A{E>Ir>p+%dHD|=l+lT zpr(Dg&>#Nu=!)6bCLr-ZS%|;h)Ij$+e@r8_{qO19QvDe=&1tmpY*0lcA^Cc-#{9fQ z<~$*<&P$Q<_jy#<$40PMofM7aQ}C=jphI`4kLg}Z7CIN#26D{-4v-_CA-LiE@(%{y!BzsU%gG`Q?sjLUf%qFSl0y)2#ae*+EI>s|i`d^V$Dn)qmzqRq6VJRY|{4ujsIU%#bnqU6MR&-1I_43=|5(6Jr;Jvert) zE?S|Tmn}Tv<-??sxV5@9t}3D=>YZ0JrQe$CO~|EY=Lj9RM&4svQHPQL6%pV5fPFiH zfXDx;l@~et{*{U*#c#Dvzu)|znDO7$#CRx)Z&yp-}SrD{&|(MQtfUz~n35@RLfUy=aqrhCX0M}J_r5QsK~NmRCR|Nm&L z41UdsLjWxSUlL41r^0K&nCCK>fdR-!MYjFg(z9_mF^C|#ZQw?`)f6uVzF^`bRnVY& zo}@M06J&_+>w9@jpaO4snmU;0t-(zYW1qVBHtuD!d?%?AtN7Plp><-1Y8Rqb20ZaP zTCgn*-Sri4Q8Xn>=gNaWQ57%!D35UkA@ksOlPB*Dvw}t02ENAqw|kFhn%ZyyW%+t{ zNdM!uqEM^;2}f+tECHbwLmH*!nZVrb$-az%t50Y2pg(HqhvY-^-lb}>^6l{$jOI6} zo_kBzj%8aX|6H5M0Y<)7pzz_wLkIpRm!;PzY)9+24wk2&TT{w--phDGDCOz{cN_ca zpnm7`$oDy=HX%0i-`769*0M6(e5j-?(?24%)<)&46y0e&6@HCDZAm9W6Ib#Y#BF6- z=30crHGg+RRTe%VBC>T00OV6F+gQDAK38Ne3N9bm|62tPccBJi)5{B z4zc^Db72XiBd}v$CF|yU{Z=M|DZ%-(XarYNclODlb1Kz1_EKLy(NSLCN`eUl(rBCL zT*jx@wNvze0|TSqgE(QArOZU)_?qH(sj#TwzElLs9q)(0u!_P|R%Cy_0JFQxgGV>1 zz4?_uq<8_gM0`c*Hh|;UMz~vrg1gQXp{ufg`hM_qU;U>+zmvc5blCLSq@PrEBSGR# z&8=2Z4uXN`F3p73ueD1l{s{k$WipAvSh5W7ABe?4)t;r@V?y`bNB5FvBuE|0VRTb< zM1Hn^?DSsJY+sX@T5xW=#>T9VEV|?<(=6|ge$X6Sb05!LFdjDcoq*gM(Zq=t;_)Le&jyt(&9jzR73noru`a# zN*<`KwGa^gZU3-)MSLF0aFag#f0<>E(bYTeHmtdbns#|I)-$)mJ`q9ctQ8g0=ET?| zdO}eZ*b_p>ygRTtR^5Ggdam=Zb5wmd{}np+Jn1d_=M`~P=M67jj})fH4ztb5yQqQW z^C|C&^LHAK-u+ooIK)yM)QM?t;|<{P;;{`p=BclzAN#JzL4jCwXkQB1Dy{=^KR`=~ zTrr)y7eiYBzSNs_DvO=4A6#EgGS-zY%Vi)N*Yb`U;6o}KR}dq{r9pT5wqZ@3NOE8- z9-(}D|Nc5732CSYQbL)!gPQ#RbD8BhK3dl{sUuPvei0tkvnJBxDEAYTesU8H$)g(Plra{VH(v3u^CO1~(+ zU0O7#)jaS4{NcwA+LuSm&VBcX2#Im3xg)W}ySNw%->orn1taZ&+d)}8gJTqA!u|5P z{yv?zol_3|(1(%M(EVU=cp?L`{Pi|ixk{U)*guFML3P!OSlz;zGA#T+E@8@cgQ_mv1o7RSU=Zo_82F?&&2r;WE z@wk}JHYEZ9nYUc(Vv~iTCa3u8e4q(yq<29VoNbKk|`mq%I6u)My=gPIDuUb&lzf4`MEA9^g8u z)vp8|$$HE9m_BTV?lOosIGa4jud=jIbw)O2eCMfyw2*S8?hjWw^nqws$O*M$3I1)x zR0PWFb3$ySOcGTe1dz%N0l;RPc`x%05FtT^f^j{YCP}*Q=lvp4$ZXrTZQHhO+w%wJn3c8j%+5C3UAFD&%8dBl_qi9D5g8fry}6Ev z2_Q~)5^N$!IU`BPh1O|=BxQ#*C5*}`lluC515$lxc-vNC)IgW=K|=z7o%cWFpndn= zX}f{`!VK02_kU+Q5a3m37J;c} zTzbxteE{GNf?yLt5X=Bzc-mio^Up0nunMCgp*ZJ;%MJvPM3QK)BryP(_v@ei4UvHr z6+sbCifQaOkL6-;5fL8$W($zZ_;CZp305C;~$hhRquZr-r)jjd1z z31%ZK{-(`P#|Um_Sivn@p$-vz46uqT>QG0B1w9znfS9A8PB2LaHdzA|_)yjXVR*l{ zkcu3@vEf7bxH0nkh`q?8FmoO_Ucui*>_a~P?qQrlZ9@+D7%MTpSnztpylXrt5!-k8_QPB?YL8Kx_On8WD zgT+111d(Op$^$&KLAN5+@?>f7F4~wFi(8TL8+szgVmcMDTp5l&k6~=rA{Dt}!gb^r zSWY<)M7D|Z2P0cEodj6E42PV>&>DFmQpgt)E-|#sSUU@uKed+F680H@<;-x{p|nuH4!_mn85rx>wz;0mPi2ZkL#k6;sznu?cXh!T0S>{w6 zL^gvR05NY64l*<+_L>On$rjx9!US;l;LX6@z}yi#2XHh)F@Oo+l)h%fq$v}DNmF2> zfs^_t0)3N-W<9-N?uedVv{)-J0W5mh#29QM5R5h&KuiRM=0Zvnf#lF=K#WlCgc#9c zS;qvh(P$!_a8JwyhI^ZJV2k+B6Z^64?w|1?5gyo6y{}923CRZfYVe1#?F% z7h2SUiNO3;T#JUOyovSs@@C1GtwipycA=*x5{BpIZ_#GCMuV8XK=x;qCNy{d7?wA~ zC+=vjls;ci&zW=6$H~4^K%v{p}Ab?U%C6Z4p%eC<3ExqU$XR<}LLF67A$Sr20DR_pJ3yeBa~ z^sw{V0FI5;UpwXsScYuhbqGQ`YQ25;6p6W^+tgL&;Ml;>S3CGpSZ>VrTn0m1$y$HU z&65)I!c?oREz};c=nLCliriqQX->4uivHTgd${GqeAlf*!P^B|jkU|*IdNP(&6C>4 zqOW$)Nw9nvjy^&`?E|gotDV{JmJ9Q~vuhy<`^C4XIUDt|j4o6rK^e8_(=YqC zuaR6TRVf@tUFHB079o4MBIh{M~4>WwnGgesQH*3?w(RA%hCZ*7)b!aNV=yOQ%o_Y=Lt0Sl*(9^jfRnC210Om$=y>*o|3z} zAR&vAdrB#mWoaB0fJSw9xw|Am$fzK>rx-~R#7IFSAwdu_EI|SRfB*yl0w8oX09H^q zAjl2?0I)v*odGJ40FVGaF&2qJq9Gv`>V>2r0|c`GX8h>CX8eHcOy>S0@<;M3<_6UM z7yCEpug5NZL!H_0>Hg_HasQGxR`rY&Z{geOy?N92Z z{lER^um|$*?*G63*njwc(R?NT)Bei*3jVzR>FWUDb^gKhtL4A=kE_1p-%Fo2`!8M} z(0AjuCiS;G{?*^1tB-uY%=)SRx&D)pK4u@>f6@KPe3}2j_har$>HqzH;UCR^ssFD0 z7h+VLO4o@_Yt>>AeaZKUxqyvxWCAjKB>qjQ30UA)#w z&=RmdwlT`7a8J8Yae=7*c8XL|{@%wA8uvCqfsNX^?UZsS>wX}QD{K}ad4y~iO*p%4 z_cS{u7Ek%?WV6em2(U9#d8(&JDirb^u~7wK4+xP$iiI6IlD|a&S)6o=kG;59N|>K1 zn(0mUqbG3YIY7dQd+*4~)`!S9m7H6HP6YcKHhBc#b%1L}VIisp%;TckEkcu0>lo@u995$<*Em;XNodjTiCdC%R+TX|_ZR#|1`RR|`^@Teh zl#w@8fI1FTx2Dy+{blUT{`^kY*V-AZUd?ZZqCS4gW(kY5?retkLbF=>p=59Nl|=sf zo1Pc|{{N4>5nt#627ylGF`3n>X%`w%bw-Y~zWM_{Si$dc82|=YhISal{N7OY?O`C4 zD|qb}6nLWJ`hUyL+E>-;ricg9J@ZNYP(x(Sct&OI$Y!QWr*=^VN;G3#i>^1n4e#Je zOVhbFbLpXVu*16enDM+ic;97@R~u&kh__kgP#!R`*rQEnA+_dLkNP~L`0alC|J;c; zeiK=s8;BsLE)KbG3BD&Br@(Ha@SBT&$?xX`=$;eeel=|R_dIr6-Ro?=HEjnsJ_b`1 zK6Yg^-6;^2aW!xeTK)A~3Rm|L^FCHB_I>jIju7ZGo&N_1*QHkxH2!!%@o4iZ?vntS;&zJdPe1dH#04YD93A44o-MpfD zP{rn_aq>U%RDvC2+bp;xPlsOzauIi3*Lf42`jVKKZCRuKdYhi>FDuL2l=v{$BCN#Q6796s%r-AG$Q^t(3c@ zD?w0UhYr11@feiyl9kY_@H8~|xlmO<8PfQmj1!$@WieW@VxR@Psxfe-v9WCi1+f>F4VL?0O~K7T?m4-u|pSkBpUJZZe*16_wAp zSYZ@;k`3;W3UHKUWc8QeI}0jH5Ly=cGWQPw(Kr2fm=-5L(d`lcXofy8tJY3@Tuadz zYWXR{mW7XT!RF#RVCe%}=tM*O6!AD3^(!8un~opNI%Uko7$5t@<8+?; zTxDys(MyyGsUjtSu9$+|_-t!U3fVb1dkK?l`17<+jfl=hrBHnDSV>^R1=TnQeyqbW z>ov#l%!1|S!1>8UUxIdhQq`_klcHVx0{?#>K3#$4GlXncwldt!g17TcvKq-jo_996 z>oA=tH9CqRl6Yw?Uc`am!V?lHJbizOJaVaScf1UP5e7Dbgabq=b!B~T&_F6?ooU>w%x0A zH~&MHJ=q`fCH{U<7MDXE4SD32cDZA)WJeWkllJ`UspWaS#eDe^kg^oU_A14UE9zG-a^g{xaXf$})Wik>gT zl#dkzGr(;h0JZDuFn(+k8wNq?PZ5grQ<+sM?wBGt@JnH6v0#or-5wBQWKU~(S_> zkE!tc*ZJ1Y&*p(xX84POb3cClRMd!^qJ#CAZfIepEj-<`VURS_yCz0(?*Ixcj4 z-!zV1_QZhpm=0<;*(nm+F>T=)o?ep@CK5I%g^VAA+RB25ab?7)A~z~egru=I1S|@v zH7tXV!0wmGS^qj#e+MY;C5eUjEAp$Y?LDkS^QPZ}8WN85?r$u<-Epi;yZ1|J2J`se z$D6DpH~2F=eI0B&=UFAUnJvZAmClJlK)sutJ?M>xpZiWV&0=G4MZP+x+p>EX=HbCz zxls%Mw?*u^;LbHWIWCyq+yi)`GmFn9J112CZda_u@YIP%i;srFg_paU02Ifij*7}l z&CF-(3|>*a|+vbNR`^RP=9G?ymEJ0Z~)d&c*UE$UMepZ zcITr{0WqhxkjUnM15js_gW=e3Uh|y6ZReaXHIz-=p`x5VvB&rH9y>Amv@^WmXFEw) zQXYrk3feir=a{jMQ+wDIkkFnZ$k{sJakHn*?u za%4b!00ev8NVLM1TY=cl?KB&55BY_MU-sg?c>=Dbz_W{(Z~c?HJi*XpYL)C6Bd8WH zt+v-#0&o~@t4qESi*)+eW%@VD0|o^yF)n0hME$UtXF$*Lvh}7sso{`|pn*JDIy5^Fm3s$5*zEE=?u5<=l8FJc3r%+H} zdfoNl2J0^~!-*mOL5o-x32|e0Im*E!yY7F7E5N)W3>+v_LBydlEx?4$RL5f2oYRD# zaR0wv(-p~wO0eLDl3K=%`{5+0Gd$ktO=W)gWlGZJ0`K z$_RNA=ckrfa;H0KA~dR^p�(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 literal 0 HcmV?d00001 diff --git a/android_app/app/src/main/res/values-night/themes.xml b/android_app/app/src/main/res/values-night/themes.xml new file mode 100644 index 00000000..7e694059 --- /dev/null +++ b/android_app/app/src/main/res/values-night/themes.xml @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/values/colors.xml b/android_app/app/src/main/res/values/colors.xml new file mode 100644 index 00000000..f8c6127d --- /dev/null +++ b/android_app/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml new file mode 100644 index 00000000..54931d36 --- /dev/null +++ b/android_app/app/src/main/res/values/strings.xml @@ -0,0 +1,12 @@ + + Mail ASP + + + + Compose mail + + + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/values/themes.xml b/android_app/app/src/main/res/values/themes.xml new file mode 100644 index 00000000..9384ee0b --- /dev/null +++ b/android_app/app/src/main/res/values/themes.xml @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/xml/backup_rules.xml b/android_app/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 00000000..4df92558 --- /dev/null +++ b/android_app/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/xml/data_extraction_rules.xml b/android_app/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 00000000..9ee9997b --- /dev/null +++ b/android_app/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/android_app/app/src/test/java/com/asp/android_app/ExampleUnitTest.java b/android_app/app/src/test/java/com/asp/android_app/ExampleUnitTest.java new file mode 100644 index 00000000..d12f7c50 --- /dev/null +++ b/android_app/app/src/test/java/com/asp/android_app/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.asp.android_app; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/android_app/build.gradle b/android_app/build.gradle new file mode 100644 index 00000000..565f8c24 --- /dev/null +++ b/android_app/build.gradle @@ -0,0 +1,4 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { +alias(libs.plugins.android.application) apply false +} \ No newline at end of file diff --git a/android_app/gradle.properties b/android_app/gradle.properties new file mode 100644 index 00000000..1c765602 --- /dev/null +++ b/android_app/gradle.properties @@ -0,0 +1,23 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. For more details, visit +# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true +# Backend's URL +API_BASE_URL=http://localhost:3001/api \ No newline at end of file diff --git a/android_app/gradle/libs.versions.toml b/android_app/gradle/libs.versions.toml new file mode 100644 index 00000000..678461de --- /dev/null +++ b/android_app/gradle/libs.versions.toml @@ -0,0 +1,42 @@ +[versions] +agp = "8.9.2" +junit = "4.13.2" +junitVersion = "1.2.1" +espressoCore = "3.6.1" +appcompat = "1.7.1" +material = "1.12.0" +constraintlayout = "2.2.1" +navigationFragment = "2.6.0" +navigationUi = "2.6.0" +activity = "1.10.1" +retrofit = "2.9.0" +gson = "2.10.1" +lifecycle = "2.6.2" +room = "2.6.1" + +[libraries] +junit = { group = "junit", name = "junit", version.ref = "junit" } +ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } +espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } +appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } +material = { group = "com.google.android.material", name = "material", version.ref = "material" } +constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } +navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment", version.ref = "navigationFragment" } +navigation-ui = { group = "androidx.navigation", name = "navigation-ui", version.ref = "navigationUi" } +activity = { group = "androidx.activity", name = "activity", version.ref = "activity" } +# Retrofit & Gson +retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" } +gson-converter = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" } + +# Lifecycle ViewModel and LiveData +lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel", version.ref = "lifecycle" } +lifecycle-livedata = { group = "androidx.lifecycle", name = "lifecycle-livedata", version.ref = "lifecycle" } + +# Room +room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" } +room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } + + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } + diff --git a/android_app/gradle/wrapper/gradle-wrapper.jar b/android_app/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f GIT binary patch literal 59203 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

K7UpUK$>l@ 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 E2O(~oYXATM literal 0 HcmV?d00001 diff --git a/android_app/gradle/wrapper/gradle-wrapper.properties b/android_app/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..308a466e --- /dev/null +++ b/android_app/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Jul 25 23:15:56 IDT 2025 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/android_app/gradlew b/android_app/gradlew new file mode 100755 index 00000000..4f906e0c --- /dev/null +++ b/android_app/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/android_app/gradlew.bat b/android_app/gradlew.bat new file mode 100644 index 00000000..107acd32 --- /dev/null +++ b/android_app/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/android_app/settings.gradle b/android_app/settings.gradle new file mode 100644 index 00000000..8c8cce7f --- /dev/null +++ b/android_app/settings.gradle @@ -0,0 +1,23 @@ +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "android_app" +include ':app' From 2ec3c8c2b10b65bc9dfe63b2c7e68bba33ef60e9 Mon Sep 17 00:00:00 2001 From: yuval Date: Fri, 25 Jul 2025 23:59:54 +0300 Subject: [PATCH 02/56] GA-123 created api and model files --- android_app/app/build.gradle | 4 ++ .../com/asp/android_app/api/ApiClient.java | 38 ++++++++++++ .../com/asp/android_app/api/LabelApi.java | 5 ++ .../java/com/asp/android_app/api/MailApi.java | 58 +++++++++++++++++++ .../java/com/asp/android_app/api/UserApi.java | 42 ++++++++++++++ .../java/com/asp/android_app/model/Label.java | 4 ++ .../java/com/asp/android_app/model/Mail.java | 4 ++ .../java/com/asp/android_app/model/User.java | 4 ++ .../model/request/LoginRequest.java | 4 ++ .../model/request/ProfileImageRequest.java | 4 ++ .../android_app/model/request/ReadStatus.java | 4 ++ .../model/request/SpamRequest.java | 4 ++ .../android_app/model/request/StarStatus.java | 4 ++ .../model/request/TrashStatus.java | 4 ++ .../model/response/AuthResponse.java | 4 ++ .../android_app/model/response/UserInfo.java | 4 ++ .../model/response/UserSearchResult.java | 4 ++ android_app/gradle.properties | 2 +- 18 files changed, 196 insertions(+), 1 deletion(-) create mode 100644 android_app/app/src/main/java/com/asp/android_app/api/ApiClient.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/api/LabelApi.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/api/MailApi.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/api/UserApi.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/model/Label.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/model/Mail.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/model/User.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/model/request/LoginRequest.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/model/request/ProfileImageRequest.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/model/request/ReadStatus.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/model/request/SpamRequest.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/model/request/StarStatus.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/model/request/TrashStatus.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/model/response/AuthResponse.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/model/response/UserInfo.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/model/response/UserSearchResult.java diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle index f5654048..08d89adc 100644 --- a/android_app/app/build.gradle +++ b/android_app/app/build.gradle @@ -6,6 +6,10 @@ android { namespace 'com.asp.android_app' compileSdk 35 + buildFeatures { + buildConfig true + } + defaultConfig { applicationId "com.asp.android_app" minSdk 24 diff --git a/android_app/app/src/main/java/com/asp/android_app/api/ApiClient.java b/android_app/app/src/main/java/com/asp/android_app/api/ApiClient.java new file mode 100644 index 00000000..c5b5ddce --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/api/ApiClient.java @@ -0,0 +1,38 @@ +package com.asp.android_app.api; + +import com.asp.android_app.BuildConfig; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import retrofit2.Retrofit; +import retrofit2.converter.gson.GsonConverterFactory; + +/** + * Singleton class responsible for providing a configured Retrofit instance. + * - Uses `http://10.0.2.2:3001/api/` as the base URL (emulator-friendly localhost) + * - Automatically adds a Bearer token to all requests using an OkHttp interceptor + * - Applies `GsonConverterFactory` to handle JSON serialization/deserialization + */ +public class ApiClient { + private static final String BASE_URL = BuildConfig.API_BASE_URL; + private static Retrofit retrofit = null; + + public static Retrofit getClient(String token) { + OkHttpClient client = new OkHttpClient.Builder() + .addInterceptor(chain -> { + Request original = chain.request(); + Request.Builder requestBuilder = original.newBuilder() + .header("Authorization", "Bearer " + token) + .method(original.method(), original.body()); + return chain.proceed(requestBuilder.build()); + }).build(); + + if (retrofit == null) { + retrofit = new Retrofit.Builder() + .baseUrl(BASE_URL + "/") + .client(client) + .addConverterFactory(GsonConverterFactory.create()) + .build(); + } + return retrofit; + } +} diff --git a/android_app/app/src/main/java/com/asp/android_app/api/LabelApi.java b/android_app/app/src/main/java/com/asp/android_app/api/LabelApi.java new file mode 100644 index 00000000..4b9f20b9 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/api/LabelApi.java @@ -0,0 +1,5 @@ +package com.asp.android_app.api; + +public interface LabelApi { + /// TODO +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/api/MailApi.java b/android_app/app/src/main/java/com/asp/android_app/api/MailApi.java new file mode 100644 index 00000000..b24b7871 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/api/MailApi.java @@ -0,0 +1,58 @@ +package com.asp.android_app.api; + + +import com.asp.android_app.model.Mail; +import com.asp.android_app.model.request.ReadStatus; +import com.asp.android_app.model.request.SpamRequest; +import com.asp.android_app.model.request.StarStatus; +import com.asp.android_app.model.request.TrashStatus; + +import java.util.List; + +import retrofit2.Call; +import retrofit2.http.Body; +import retrofit2.http.DELETE; +import retrofit2.http.GET; +import retrofit2.http.PATCH; +import retrofit2.http.POST; +import retrofit2.http.Path; +import retrofit2.http.Query; + +/** + * MailApi defines the REST API endpoints related to mail operations. + * These match the backend's `/mails` and `/blacklist` routes. + * All calls expect a valid JWT token in the Authorization header. + */ +public interface MailApi { + + @GET("mails/{id}") + Call fetchMail(@Path("id") int id); + + @GET("mails") + Call> getMailsByType( + @Query("inboxType") String inboxType, + @Query("page") int page, + @Query("limit") int limit + ); + + @DELETE("mails/{id}") + Call deleteMail(@Path("id") int id); + + @POST("blacklist") + Call markAsSpam(@Body SpamRequest request); + + @DELETE("blacklist") + Call removeFromSpam(@Body SpamRequest request); + + @PATCH("mails/{id}") + Call markAsRead(@Path("id") int id, @Body ReadStatus status); + + @PATCH("mails/{id}") + Call toggleStar(@Path("id") int id, @Body StarStatus status); + + @PATCH("mails/{id}") + Call restoreMail(@Path("id") int id, @Body TrashStatus status); + + @GET("mails/search/{query}") + Call> searchMails(@Path("query") String query); +} diff --git a/android_app/app/src/main/java/com/asp/android_app/api/UserApi.java b/android_app/app/src/main/java/com/asp/android_app/api/UserApi.java new file mode 100644 index 00000000..f7b7e07e --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/api/UserApi.java @@ -0,0 +1,42 @@ +package com.asp.android_app.api; + + +import com.asp.android_app.model.User; +import com.asp.android_app.model.request.LoginRequest; +import com.asp.android_app.model.request.ProfileImageRequest; +import com.asp.android_app.model.response.AuthResponse; +import com.asp.android_app.model.response.UserInfo; +import com.asp.android_app.model.response.UserSearchResult; + +import java.util.List; + +import retrofit2.Call; +import retrofit2.http.Body; +import retrofit2.http.GET; +import retrofit2.http.PATCH; +import retrofit2.http.POST; +import retrofit2.http.Path; +import retrofit2.http.Query; + +/** + * UserApi defines the REST API endpoints for user authentication and profile management. + * These match the backend's `/users` and `/tokens` routes. + * Most calls require either a Bearer token or a `user-id` header, depending on server expectations. + */ +public interface UserApi { + + @POST("users") + Call register(@Body User user); + + @POST("tokens") + Call login(@Body LoginRequest loginRequest); + + @GET("users/search") + Call> searchByEmail(@Query("email") String query); + + @GET("users/{id}") + Call fetchUserInfo(@Path("id") int userId); + + @PATCH("users/{id}") + Call changeProfileImage(@Path("id") int userId, @Body ProfileImageRequest body); +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/model/Label.java b/android_app/app/src/main/java/com/asp/android_app/model/Label.java new file mode 100644 index 00000000..a4d27411 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/model/Label.java @@ -0,0 +1,4 @@ +package com.asp.android_app.model; + +public class Label { +} diff --git a/android_app/app/src/main/java/com/asp/android_app/model/Mail.java b/android_app/app/src/main/java/com/asp/android_app/model/Mail.java new file mode 100644 index 00000000..e196af8c --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/model/Mail.java @@ -0,0 +1,4 @@ +package com.asp.android_app.model; + +public class Mail { +} diff --git a/android_app/app/src/main/java/com/asp/android_app/model/User.java b/android_app/app/src/main/java/com/asp/android_app/model/User.java new file mode 100644 index 00000000..cd40c357 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/model/User.java @@ -0,0 +1,4 @@ +package com.asp.android_app.model; + +public class User { +} diff --git a/android_app/app/src/main/java/com/asp/android_app/model/request/LoginRequest.java b/android_app/app/src/main/java/com/asp/android_app/model/request/LoginRequest.java new file mode 100644 index 00000000..194668ec --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/model/request/LoginRequest.java @@ -0,0 +1,4 @@ +package com.asp.android_app.model.request; + +public class LoginRequest { +} diff --git a/android_app/app/src/main/java/com/asp/android_app/model/request/ProfileImageRequest.java b/android_app/app/src/main/java/com/asp/android_app/model/request/ProfileImageRequest.java new file mode 100644 index 00000000..6df45a15 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/model/request/ProfileImageRequest.java @@ -0,0 +1,4 @@ +package com.asp.android_app.model.request; + +public class ProfileImageRequest { +} diff --git a/android_app/app/src/main/java/com/asp/android_app/model/request/ReadStatus.java b/android_app/app/src/main/java/com/asp/android_app/model/request/ReadStatus.java new file mode 100644 index 00000000..295a1b1c --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/model/request/ReadStatus.java @@ -0,0 +1,4 @@ +package com.asp.android_app.model.request; + +public class ReadStatus { +} diff --git a/android_app/app/src/main/java/com/asp/android_app/model/request/SpamRequest.java b/android_app/app/src/main/java/com/asp/android_app/model/request/SpamRequest.java new file mode 100644 index 00000000..d4822224 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/model/request/SpamRequest.java @@ -0,0 +1,4 @@ +package com.asp.android_app.model.request; + +public class SpamRequest { +} diff --git a/android_app/app/src/main/java/com/asp/android_app/model/request/StarStatus.java b/android_app/app/src/main/java/com/asp/android_app/model/request/StarStatus.java new file mode 100644 index 00000000..c2877aa9 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/model/request/StarStatus.java @@ -0,0 +1,4 @@ +package com.asp.android_app.model.request; + +public class StarStatus { +} diff --git a/android_app/app/src/main/java/com/asp/android_app/model/request/TrashStatus.java b/android_app/app/src/main/java/com/asp/android_app/model/request/TrashStatus.java new file mode 100644 index 00000000..a4c92d36 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/model/request/TrashStatus.java @@ -0,0 +1,4 @@ +package com.asp.android_app.model.request; + +public class TrashStatus { +} diff --git a/android_app/app/src/main/java/com/asp/android_app/model/response/AuthResponse.java b/android_app/app/src/main/java/com/asp/android_app/model/response/AuthResponse.java new file mode 100644 index 00000000..5601f05a --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/model/response/AuthResponse.java @@ -0,0 +1,4 @@ +package com.asp.android_app.model.response; + +public class AuthResponse { +} diff --git a/android_app/app/src/main/java/com/asp/android_app/model/response/UserInfo.java b/android_app/app/src/main/java/com/asp/android_app/model/response/UserInfo.java new file mode 100644 index 00000000..d598516b --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/model/response/UserInfo.java @@ -0,0 +1,4 @@ +package com.asp.android_app.model.response; + +public class UserInfo { +} diff --git a/android_app/app/src/main/java/com/asp/android_app/model/response/UserSearchResult.java b/android_app/app/src/main/java/com/asp/android_app/model/response/UserSearchResult.java new file mode 100644 index 00000000..07b4afbe --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/model/response/UserSearchResult.java @@ -0,0 +1,4 @@ +package com.asp.android_app.model.response; + +public class UserSearchResult { +} diff --git a/android_app/gradle.properties b/android_app/gradle.properties index 1c765602..2b8fbc82 100644 --- a/android_app/gradle.properties +++ b/android_app/gradle.properties @@ -20,4 +20,4 @@ android.useAndroidX=true # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true # Backend's URL -API_BASE_URL=http://localhost:3001/api \ No newline at end of file +API_BASE_URL=http://10.0.2.2:3001/api/ \ No newline at end of file From 18dc4e5d194cdb4d337ab3f75c4837bf3789a913 Mon Sep 17 00:00:00 2001 From: yuval Date: Sat, 26 Jul 2025 00:10:51 +0300 Subject: [PATCH 03/56] GA-124 Model classes for retrofit --- .../java/com/asp/android_app/api/MailApi.java | 2 +- .../java/com/asp/android_app/api/UserApi.java | 1 - .../java/com/asp/android_app/model/Mail.java | 175 +++++++++++++++++- .../java/com/asp/android_app/model/User.java | 75 ++++++++ .../model/request/LoginRequest.java | 48 ++++- .../model/request/ProfileImageRequest.java | 32 +++- .../android_app/model/request/ReadStatus.java | 32 +++- .../model/request/SpamRequest.java | 32 +++- .../android_app/model/request/StarStatus.java | 32 +++- .../model/request/TrashStatus.java | 31 +++- .../model/response/AuthResponse.java | 27 ++- .../android_app/model/response/UserInfo.java | 45 ++++- .../model/response/UserSearchResult.java | 64 ++++++- 13 files changed, 584 insertions(+), 12 deletions(-) diff --git a/android_app/app/src/main/java/com/asp/android_app/api/MailApi.java b/android_app/app/src/main/java/com/asp/android_app/api/MailApi.java index b24b7871..2f3629d4 100644 --- a/android_app/app/src/main/java/com/asp/android_app/api/MailApi.java +++ b/android_app/app/src/main/java/com/asp/android_app/api/MailApi.java @@ -1,6 +1,5 @@ package com.asp.android_app.api; - import com.asp.android_app.model.Mail; import com.asp.android_app.model.request.ReadStatus; import com.asp.android_app.model.request.SpamRequest; @@ -56,3 +55,4 @@ Call> getMailsByType( @GET("mails/search/{query}") Call> searchMails(@Path("query") String query); } + diff --git a/android_app/app/src/main/java/com/asp/android_app/api/UserApi.java b/android_app/app/src/main/java/com/asp/android_app/api/UserApi.java index f7b7e07e..046334d9 100644 --- a/android_app/app/src/main/java/com/asp/android_app/api/UserApi.java +++ b/android_app/app/src/main/java/com/asp/android_app/api/UserApi.java @@ -1,6 +1,5 @@ package com.asp.android_app.api; - import com.asp.android_app.model.User; import com.asp.android_app.model.request.LoginRequest; import com.asp.android_app.model.request.ProfileImageRequest; diff --git a/android_app/app/src/main/java/com/asp/android_app/model/Mail.java b/android_app/app/src/main/java/com/asp/android_app/model/Mail.java index e196af8c..b951b1bf 100644 --- a/android_app/app/src/main/java/com/asp/android_app/model/Mail.java +++ b/android_app/app/src/main/java/com/asp/android_app/model/Mail.java @@ -1,4 +1,177 @@ package com.asp.android_app.model; + +/** + * Represents an email message. + * Used in: + * - GET /mails + * - GET /mails/:id + * - PATCH /mails/:id (to update read/starred/trash status) + */ public class Mail { -} + private int id; + private int senderId; + private String senderName; + private String senderMail; + private String subject; + private String body; + private String timestamp; + private boolean isRead; + private boolean isStarred; + private boolean isTrashed; + private boolean isSpam; + + /** + * @return the unique ID of the mail + */ + public int getId() { + return id; + } + + /** + * @param id the unique ID of the mail + */ + public void setId(int id) { + this.id = id; + } + + /** + * @return the sender's user ID + */ + public int getSenderId() { + return senderId; + } + + /** + * @param senderId the sender's user ID + */ + public void setSenderId(int senderId) { + this.senderId = senderId; + } + + /** + * @return the full name of the sender + */ + public String getSenderName() { + return senderName; + } + + /** + * @param senderName the full name of the sender + */ + public void setSenderName(String senderName) { + this.senderName = senderName; + } + + /** + * @return the email address of the sender + */ + public String getSenderMail() { + return senderMail; + } + + /** + * @param senderMail the sender's email address + */ + public void setSenderMail(String senderMail) { + this.senderMail = senderMail; + } + + /** + * @return the subject of the mail + */ + public String getSubject() { + return subject; + } + + /** + * @param subject the subject to set + */ + public void setSubject(String subject) { + this.subject = subject; + } + + /** + * @return the body content of the mail + */ + public String getBody() { + return body; + } + + /** + * @param body the content of the mail + */ + public void setBody(String body) { + this.body = body; + } + + /** + * @return timestamp string of when the mail was sent + */ + public String getTimestamp() { + return timestamp; + } + + /** + * @param timestamp timestamp string of when the mail was sent + */ + public void setTimestamp(String timestamp) { + this.timestamp = timestamp; + } + + /** + * @return true if the mail has been read + */ + public boolean isRead() { + return isRead; + } + + /** + * @param read whether the mail has been read + */ + public void setRead(boolean read) { + isRead = read; + } + + /** + * @return true if the mail is starred + */ + public boolean isStarred() { + return isStarred; + } + + /** + * @param starred whether the mail is starred + */ + public void setStarred(boolean starred) { + isStarred = starred; + } + + /** + * @return true if the mail is in the trash + */ + public boolean isTrashed() { + return isTrashed; + } + + /** + * @param trashed whether the mail is in the trash + */ + public void setTrashed(boolean trashed) { + isTrashed = trashed; + } + + /** + * @return true if the mail is marked as spam + */ + public boolean isSpam() { + return isSpam; + } + + /** + * @param spam whether the mail is marked as spam + */ + public void setSpam(boolean spam) { + isSpam = spam; + } +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/model/User.java b/android_app/app/src/main/java/com/asp/android_app/model/User.java index cd40c357..847b5953 100644 --- a/android_app/app/src/main/java/com/asp/android_app/model/User.java +++ b/android_app/app/src/main/java/com/asp/android_app/model/User.java @@ -1,4 +1,79 @@ package com.asp.android_app.model; +/** + * Represents a user used for registration and login operations. + * Used in: + * - POST /users (registration) + * - Passed as part of LoginRequest (email and password) + */ public class User { + /** + * Full name of the user. + */ + private String fullName; + + /** + * Email address of the user. + */ + private String mail; + + /** + * Password chosen by the user. + */ + private String password; + + /** + * Constructs a new User for registration. + * + * @param fullName the full name of the user + * @param mail the user's email address + * @param password the user's password + */ + public User(String fullName, String mail, String password) { + this.fullName = fullName; + this.mail = mail; + this.password = password; + } + + /** + * @return the full name of the user + */ + public String getFullName() { + return fullName; + } + + /** + * @param fullName the full name to set + */ + public void setFullName(String fullName) { + this.fullName = fullName; + } + + /** + * @return the email address of the user + */ + public String getMail() { + return mail; + } + + /** + * @param mail the email address to set + */ + public void setMail(String mail) { + this.mail = mail; + } + + /** + * @return the user's password + */ + public String getPassword() { + return password; + } + + /** + * @param password the password to set + */ + public void setPassword(String password) { + this.password = password; + } } diff --git a/android_app/app/src/main/java/com/asp/android_app/model/request/LoginRequest.java b/android_app/app/src/main/java/com/asp/android_app/model/request/LoginRequest.java index 194668ec..e85cb949 100644 --- a/android_app/app/src/main/java/com/asp/android_app/model/request/LoginRequest.java +++ b/android_app/app/src/main/java/com/asp/android_app/model/request/LoginRequest.java @@ -1,4 +1,50 @@ package com.asp.android_app.model.request; +/** + * Request body for user login. + * Used in: + * - POST /tokens + */ public class LoginRequest { -} + private String mail; + private String password; + + /** + * Constructs a login request. + * + * @param mail user's email address + * @param password user's password + */ + public LoginRequest(String mail, String password) { + this.mail = mail; + this.password = password; + } + + /** + * @return email address of the user + */ + public String getMail() { + return mail; + } + + /** + * @param mail email address to set + */ + public void setMail(String mail) { + this.mail = mail; + } + + /** + * @return password of the user + */ + public String getPassword() { + return password; + } + + /** + * @param password password to set + */ + public void setPassword(String password) { + this.password = password; + } +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/model/request/ProfileImageRequest.java b/android_app/app/src/main/java/com/asp/android_app/model/request/ProfileImageRequest.java index 6df45a15..3cb78219 100644 --- a/android_app/app/src/main/java/com/asp/android_app/model/request/ProfileImageRequest.java +++ b/android_app/app/src/main/java/com/asp/android_app/model/request/ProfileImageRequest.java @@ -1,4 +1,34 @@ package com.asp.android_app.model.request; + +/** + * Request body for changing profile image. + * Used in: + * - PATCH /users/{id} + */ public class ProfileImageRequest { -} + private String image; + + /** + * Constructs a request with a base64 image string. + * + * @param image base64-encoded image string + */ + public ProfileImageRequest(String image) { + this.image = image; + } + + /** + * @return base64 image string + */ + public String getImage() { + return image; + } + + /** + * @param image base64 image string to set + */ + public void setImage(String image) { + this.image = image; + } +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/model/request/ReadStatus.java b/android_app/app/src/main/java/com/asp/android_app/model/request/ReadStatus.java index 295a1b1c..48475a2c 100644 --- a/android_app/app/src/main/java/com/asp/android_app/model/request/ReadStatus.java +++ b/android_app/app/src/main/java/com/asp/android_app/model/request/ReadStatus.java @@ -1,4 +1,34 @@ package com.asp.android_app.model.request; + +/** + * Request body for updating the "read" status of a mail. + * Used in: + * - PATCH /mails/{id} + */ public class ReadStatus { -} + private boolean isRead; + + /** + * Constructs a request to mark a mail as read. + * + * @param isRead true if mail should be marked as read + */ + public ReadStatus(boolean isRead) { + this.isRead = isRead; + } + + /** + * @return true if the mail is marked as read + */ + public boolean isRead() { + return isRead; + } + + /** + * @param isRead whether to mark the mail as read + */ + public void setRead(boolean isRead) { + this.isRead = isRead; + } +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/model/request/SpamRequest.java b/android_app/app/src/main/java/com/asp/android_app/model/request/SpamRequest.java index d4822224..05b8f99b 100644 --- a/android_app/app/src/main/java/com/asp/android_app/model/request/SpamRequest.java +++ b/android_app/app/src/main/java/com/asp/android_app/model/request/SpamRequest.java @@ -1,4 +1,34 @@ package com.asp.android_app.model.request; +/** + * Request model used to mark or unmark a mail as spam. + * Used in: + * - POST /blacklist (to mark as spam) + * - DELETE /blacklist (to remove from spam) + */ public class SpamRequest { -} + private int mailId; + + /** + * Constructs a request for marking or unmarking spam. + * + * @param mailId ID of the mail being reported or unreported as spam + */ + public SpamRequest(int mailId) { + this.mailId = mailId; + } + + /** + * @return ID of the mail + */ + public int getMailId() { + return mailId; + } + + /** + * @param mailId ID of the mail to set + */ + public void setMailId(int mailId) { + this.mailId = mailId; + } +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/model/request/StarStatus.java b/android_app/app/src/main/java/com/asp/android_app/model/request/StarStatus.java index c2877aa9..08c5a6ff 100644 --- a/android_app/app/src/main/java/com/asp/android_app/model/request/StarStatus.java +++ b/android_app/app/src/main/java/com/asp/android_app/model/request/StarStatus.java @@ -1,4 +1,34 @@ package com.asp.android_app.model.request; +/** + * Request body for toggling the "starred" status of a mail. + * + * Used in: + * - PATCH /mails/{id} + */ public class StarStatus { -} + private boolean isStarred; + + /** + * Constructs a request to update starred status. + * + * @param isStarred true if the mail should be starred + */ + public StarStatus(boolean isStarred) { + this.isStarred = isStarred; + } + + /** + * @return true if the mail should be starred + */ + public boolean isStarred() { + return isStarred; + } + + /** + * @param isStarred whether the mail should be starred + */ + public void setStarred(boolean isStarred) { + this.isStarred = isStarred; + } +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/model/request/TrashStatus.java b/android_app/app/src/main/java/com/asp/android_app/model/request/TrashStatus.java index a4c92d36..ee7a3321 100644 --- a/android_app/app/src/main/java/com/asp/android_app/model/request/TrashStatus.java +++ b/android_app/app/src/main/java/com/asp/android_app/model/request/TrashStatus.java @@ -1,4 +1,33 @@ package com.asp.android_app.model.request; +/** + * Request body for updating the "trashed" status of a mail. + * Used in: + * - PATCH /mails/{id} (for restore) + */ public class TrashStatus { -} + private boolean isTrashed; + + /** + * Constructs a request to update trash status. + * + * @param isTrashed false to restore from trash + */ + public TrashStatus(boolean isTrashed) { + this.isTrashed = isTrashed; + } + + /** + * @return true if the mail is currently trashed + */ + public boolean isTrashed() { + return isTrashed; + } + + /** + * @param isTrashed whether the mail should be marked as trashed + */ + public void setTrashed(boolean isTrashed) { + this.isTrashed = isTrashed; + } +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/model/response/AuthResponse.java b/android_app/app/src/main/java/com/asp/android_app/model/response/AuthResponse.java index 5601f05a..9c9b2be1 100644 --- a/android_app/app/src/main/java/com/asp/android_app/model/response/AuthResponse.java +++ b/android_app/app/src/main/java/com/asp/android_app/model/response/AuthResponse.java @@ -1,4 +1,29 @@ package com.asp.android_app.model.response; +/** + * Represents the response returned after a successful login or registration. + * Used in: + * - POST /tokens + * - POST /users + */ public class AuthResponse { -} + + /** + * JWT token assigned to the authenticated user. + */ + private String token; + + /** + * @return JWT token returned by the server + */ + public String getToken() { + return token; + } + + /** + * @param token JWT token to assign + */ + public void setToken(String token) { + this.token = token; + } +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/model/response/UserInfo.java b/android_app/app/src/main/java/com/asp/android_app/model/response/UserInfo.java index d598516b..cd5db49b 100644 --- a/android_app/app/src/main/java/com/asp/android_app/model/response/UserInfo.java +++ b/android_app/app/src/main/java/com/asp/android_app/model/response/UserInfo.java @@ -1,4 +1,47 @@ package com.asp.android_app.model.response; +/** + * Represents basic public profile information for a user. + * Used in: + * - GET /users/{id} + */ public class UserInfo { -} + + /** + * The full name of the user. + */ + private String fullName; + + /** + * The URL to the user's profile image. + */ + private String imageUrl; + + /** + * @return full name of the user + */ + public String getFullName() { + return fullName; + } + + /** + * @param fullName full name to set + */ + public void setFullName(String fullName) { + this.fullName = fullName; + } + + /** + * @return profile image URL + */ + public String getImageUrl() { + return imageUrl; + } + + /** + * @param imageUrl URL of the profile image + */ + public void setImageUrl(String imageUrl) { + this.imageUrl = imageUrl; + } +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/model/response/UserSearchResult.java b/android_app/app/src/main/java/com/asp/android_app/model/response/UserSearchResult.java index 07b4afbe..709849ad 100644 --- a/android_app/app/src/main/java/com/asp/android_app/model/response/UserSearchResult.java +++ b/android_app/app/src/main/java/com/asp/android_app/model/response/UserSearchResult.java @@ -1,4 +1,66 @@ package com.asp.android_app.model.response; +/** + * Represents a single result item when searching for users by email. + * Used in: + * - GET /users/search?email=... + */ public class UserSearchResult { -} + + /** + * Unique ID of the user. + */ + private int id; + + /** + * Full name of the user. + */ + private String fullName; + + /** + * Email address of the user. + */ + private String mail; + + /** + * @return unique ID of the user + */ + public int getId() { + return id; + } + + /** + * @param id unique user ID to assign + */ + public void setId(int id) { + this.id = id; + } + + /** + * @return full name of the user + */ + public String getFullName() { + return fullName; + } + + /** + * @param fullName full name to assign + */ + public void setFullName(String fullName) { + this.fullName = fullName; + } + + /** + * @return email address of the user + */ + public String getMail() { + return mail; + } + + /** + * @param mail email address to assign + */ + public void setMail(String mail) { + this.mail = mail; + } +} \ No newline at end of file From ea51e47e8be944458d080e9363fa2960e6d338ac Mon Sep 17 00:00:00 2001 From: yuval Date: Thu, 31 Jul 2025 21:50:45 +0300 Subject: [PATCH 04/56] GA-125 util token manager and refactor to api client singleton --- .../com/asp/android_app/api/ApiClient.java | 18 +++++-- .../asp/android_app/utils/TokenManager.java | 51 +++++++++++++++++++ 2 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 android_app/app/src/main/java/com/asp/android_app/utils/TokenManager.java diff --git a/android_app/app/src/main/java/com/asp/android_app/api/ApiClient.java b/android_app/app/src/main/java/com/asp/android_app/api/ApiClient.java index c5b5ddce..c55e8408 100644 --- a/android_app/app/src/main/java/com/asp/android_app/api/ApiClient.java +++ b/android_app/app/src/main/java/com/asp/android_app/api/ApiClient.java @@ -1,6 +1,10 @@ package com.asp.android_app.api; +import android.content.Context; + import com.asp.android_app.BuildConfig; +import com.asp.android_app.utils.TokenManager; + import okhttp3.OkHttpClient; import okhttp3.Request; import retrofit2.Retrofit; @@ -16,19 +20,23 @@ public class ApiClient { private static final String BASE_URL = BuildConfig.API_BASE_URL; private static Retrofit retrofit = null; - public static Retrofit getClient(String token) { + public static Retrofit getClient(Context context) { + String token = TokenManager.getInstance(context).getToken(); OkHttpClient client = new OkHttpClient.Builder() .addInterceptor(chain -> { Request original = chain.request(); - Request.Builder requestBuilder = original.newBuilder() - .header("Authorization", "Bearer " + token) - .method(original.method(), original.body()); + Request.Builder requestBuilder = original.newBuilder(); + // Add token Authorization only if token exists and isn't empty + if (token != null && !token.isBlank()) + requestBuilder.header("Authorization", "Bearer " + token); + // add the request's body + requestBuilder.method(original.method(), original.body()); return chain.proceed(requestBuilder.build()); }).build(); if (retrofit == null) { retrofit = new Retrofit.Builder() - .baseUrl(BASE_URL + "/") + .baseUrl(BASE_URL) .client(client) .addConverterFactory(GsonConverterFactory.create()) .build(); diff --git a/android_app/app/src/main/java/com/asp/android_app/utils/TokenManager.java b/android_app/app/src/main/java/com/asp/android_app/utils/TokenManager.java new file mode 100644 index 00000000..c4ecfbc9 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/utils/TokenManager.java @@ -0,0 +1,51 @@ +package com.asp.android_app.utils; + +import android.content.Context; +import android.content.SharedPreferences; + +/** + * Singleton utility class for saving and retrieving the JWT token using SharedPreferences. + * Used for attaching Authorization header to every Retrofit request. + */ +public class TokenManager { + private static final String PREF_NAME = "GmailPrefs"; + private static final String KEY_TOKEN = "jwt_token"; + + private static TokenManager instance; + private final SharedPreferences prefs; + + private TokenManager(Context context) { + prefs = context.getApplicationContext().getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE); + } + + /** + * Initializes and returns the singleton instance. + */ + public static synchronized TokenManager getInstance(Context context) { + if (instance == null) { + instance = new TokenManager(context); + } + return instance; + } + + /** + * Saves the JWT token to SharedPreferences. + */ + public void saveToken(String token) { + prefs.edit().putString(KEY_TOKEN, token).apply(); + } + + /** + * Retrieves the JWT token from SharedPreferences. + */ + public String getToken() { + return prefs.getString(KEY_TOKEN, null); + } + + /** + * Clears the saved JWT token (e.g., on logout). + */ + public void clearToken() { + prefs.edit().remove(KEY_TOKEN).apply(); + } +} From d3b1775ede16a884235a38eba6f0c5c1049e21ba Mon Sep 17 00:00:00 2001 From: yuval Date: Thu, 31 Jul 2025 22:13:43 +0300 Subject: [PATCH 05/56] GA-126 classes for mails --- android_app/app/src/main/AndroidManifest.xml | 4 +- .../{ => activity}/InboxActivity.java | 4 +- .../{ => activity}/MainActivity.java | 4 +- .../java/com/asp/android_app/api/MailApi.java | 6 +- .../{request => response}/ReadStatus.java | 2 +- .../{request => response}/StarStatus.java | 2 +- .../{request => response}/TrashStatus.java | 2 +- .../repository/MailRepository.java | 310 ++++++++++++++++++ .../com/asp/android_app/utils/Result.java | 38 +++ .../android_app/viewmodel/MailViewModel.java | 62 ++++ .../src/main/res/layout/activity_inbox.xml | 2 +- .../app/src/main/res/layout/activity_main.xml | 2 +- 12 files changed, 426 insertions(+), 12 deletions(-) rename android_app/app/src/main/java/com/asp/android_app/{ => activity}/InboxActivity.java (81%) rename android_app/app/src/main/java/com/asp/android_app/{ => activity}/MainActivity.java (81%) rename android_app/app/src/main/java/com/asp/android_app/model/{request => response}/ReadStatus.java (93%) rename android_app/app/src/main/java/com/asp/android_app/model/{request => response}/StarStatus.java (93%) rename android_app/app/src/main/java/com/asp/android_app/model/{request => response}/TrashStatus.java (94%) create mode 100644 android_app/app/src/main/java/com/asp/android_app/repository/MailRepository.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/utils/Result.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/viewmodel/MailViewModel.java diff --git a/android_app/app/src/main/AndroidManifest.xml b/android_app/app/src/main/AndroidManifest.xml index eb05342f..d166515b 100644 --- a/android_app/app/src/main/AndroidManifest.xml +++ b/android_app/app/src/main/AndroidManifest.xml @@ -14,10 +14,10 @@ tools:targetApi="31"> diff --git a/android_app/app/src/main/java/com/asp/android_app/InboxActivity.java b/android_app/app/src/main/java/com/asp/android_app/activity/InboxActivity.java similarity index 81% rename from android_app/app/src/main/java/com/asp/android_app/InboxActivity.java rename to android_app/app/src/main/java/com/asp/android_app/activity/InboxActivity.java index 07055d54..8fca773c 100644 --- a/android_app/app/src/main/java/com/asp/android_app/InboxActivity.java +++ b/android_app/app/src/main/java/com/asp/android_app/activity/InboxActivity.java @@ -1,9 +1,11 @@ -package com.asp.android_app; +package com.asp.android_app.activity; import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; +import com.asp.android_app.R; + public class InboxActivity extends AppCompatActivity { diff --git a/android_app/app/src/main/java/com/asp/android_app/MainActivity.java b/android_app/app/src/main/java/com/asp/android_app/activity/MainActivity.java similarity index 81% rename from android_app/app/src/main/java/com/asp/android_app/MainActivity.java rename to android_app/app/src/main/java/com/asp/android_app/activity/MainActivity.java index a9572ec0..cd128830 100644 --- a/android_app/app/src/main/java/com/asp/android_app/MainActivity.java +++ b/android_app/app/src/main/java/com/asp/android_app/activity/MainActivity.java @@ -1,9 +1,11 @@ -package com.asp.android_app; +package com.asp.android_app.activity; import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; +import com.asp.android_app.R; + public class MainActivity extends AppCompatActivity { diff --git a/android_app/app/src/main/java/com/asp/android_app/api/MailApi.java b/android_app/app/src/main/java/com/asp/android_app/api/MailApi.java index 2f3629d4..db7181c9 100644 --- a/android_app/app/src/main/java/com/asp/android_app/api/MailApi.java +++ b/android_app/app/src/main/java/com/asp/android_app/api/MailApi.java @@ -1,10 +1,10 @@ package com.asp.android_app.api; import com.asp.android_app.model.Mail; -import com.asp.android_app.model.request.ReadStatus; +import com.asp.android_app.model.response.ReadStatus; import com.asp.android_app.model.request.SpamRequest; -import com.asp.android_app.model.request.StarStatus; -import com.asp.android_app.model.request.TrashStatus; +import com.asp.android_app.model.response.StarStatus; +import com.asp.android_app.model.response.TrashStatus; import java.util.List; diff --git a/android_app/app/src/main/java/com/asp/android_app/model/request/ReadStatus.java b/android_app/app/src/main/java/com/asp/android_app/model/response/ReadStatus.java similarity index 93% rename from android_app/app/src/main/java/com/asp/android_app/model/request/ReadStatus.java rename to android_app/app/src/main/java/com/asp/android_app/model/response/ReadStatus.java index 48475a2c..37f86633 100644 --- a/android_app/app/src/main/java/com/asp/android_app/model/request/ReadStatus.java +++ b/android_app/app/src/main/java/com/asp/android_app/model/response/ReadStatus.java @@ -1,4 +1,4 @@ -package com.asp.android_app.model.request; +package com.asp.android_app.model.response; /** diff --git a/android_app/app/src/main/java/com/asp/android_app/model/request/StarStatus.java b/android_app/app/src/main/java/com/asp/android_app/model/response/StarStatus.java similarity index 93% rename from android_app/app/src/main/java/com/asp/android_app/model/request/StarStatus.java rename to android_app/app/src/main/java/com/asp/android_app/model/response/StarStatus.java index 08c5a6ff..4c53cbbb 100644 --- a/android_app/app/src/main/java/com/asp/android_app/model/request/StarStatus.java +++ b/android_app/app/src/main/java/com/asp/android_app/model/response/StarStatus.java @@ -1,4 +1,4 @@ -package com.asp.android_app.model.request; +package com.asp.android_app.model.response; /** * Request body for toggling the "starred" status of a mail. diff --git a/android_app/app/src/main/java/com/asp/android_app/model/request/TrashStatus.java b/android_app/app/src/main/java/com/asp/android_app/model/response/TrashStatus.java similarity index 94% rename from android_app/app/src/main/java/com/asp/android_app/model/request/TrashStatus.java rename to android_app/app/src/main/java/com/asp/android_app/model/response/TrashStatus.java index ee7a3321..4d1bcb5c 100644 --- a/android_app/app/src/main/java/com/asp/android_app/model/request/TrashStatus.java +++ b/android_app/app/src/main/java/com/asp/android_app/model/response/TrashStatus.java @@ -1,4 +1,4 @@ -package com.asp.android_app.model.request; +package com.asp.android_app.model.response; /** * Request body for updating the "trashed" status of a mail. diff --git a/android_app/app/src/main/java/com/asp/android_app/repository/MailRepository.java b/android_app/app/src/main/java/com/asp/android_app/repository/MailRepository.java new file mode 100644 index 00000000..ca026b48 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/repository/MailRepository.java @@ -0,0 +1,310 @@ +package com.asp.android_app.repository; + +import android.content.Context; + +import androidx.annotation.NonNull; +import androidx.lifecycle.MutableLiveData; + +import com.asp.android_app.api.ApiClient; +import com.asp.android_app.api.MailApi; +import com.asp.android_app.model.Mail; +import com.asp.android_app.model.request.SpamRequest; +import com.asp.android_app.model.response.ReadStatus; +import com.asp.android_app.model.response.StarStatus; +import com.asp.android_app.model.response.TrashStatus; +import com.asp.android_app.utils.Result; + +import java.util.List; + +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; + +/** + * Repository class for handling mail-related data operations. + * Responsible for calling the MailApi and exposing results via LiveData. + */ +public class MailRepository { + + private final MailApi mailApi; + + public MailRepository(Context context) { + mailApi = ApiClient.getClient(context).create(MailApi.class); + } + + /** + * Fetch mails by inbox type and page number. + * + * @param inboxType "incoming", "sent", "star", "trash", etc. + * @param page current page number + * @param resultLiveData a LiveData object to observe result (success, error, loading) + */ + public void getMailsByType( + String inboxType, + int page, + MutableLiveData>> resultLiveData) { + final int MAIL_LIMIT = 50; + resultLiveData.postValue(new Result.Loading<>()); + + // GET mails by type + mailApi.getMailsByType(inboxType, page, MAIL_LIMIT).enqueue(new Callback<>() { + @Override + public void onResponse(@NonNull Call> call, @NonNull Response> res) { + if (res.isSuccessful()) { + resultLiveData.postValue(new Result.Success<>(res.body())); + return; + } + resultLiveData.postValue(new Result.Error<>("Error fetching mails: " + res.code())); + + } + + @Override + public void onFailure(@NonNull Call> call, @NonNull Throwable t) { + resultLiveData.postValue(new Result.Error<>(t.getMessage())); + } + }); + } + + /** + * Fetch a mail by it's id. + * + * @param id id of the mail + * @param resultLiveData a LiveData object to observe result (success, error, loading) + */ + public void fetchMail(int id, MutableLiveData> resultLiveData) { + resultLiveData.postValue(new Result.Loading<>()); + + mailApi.fetchMail(id).enqueue(new Callback<>() { + @Override + public void onResponse(@NonNull Call call, @NonNull Response res) { + if (res.isSuccessful()) { + resultLiveData.postValue(new Result.Success<>(res.body())); + return; + } + resultLiveData.postValue(new Result.Error<>("Error fetching mail: " + res.code())); + } + + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable t) { + resultLiveData.postValue(new Result.Error<>(t.getMessage())); + } + }); + } + + /** + * Delete a mail by its ID. + * + * @param mailId The ID of the mail to delete + * @param resultLiveData The LiveData object where the result will be posted + */ + public void deleteMail(int mailId, MutableLiveData> resultLiveData) { + resultLiveData.postValue(new Result.Loading<>()); + + mailApi.deleteMail(mailId).enqueue( + new Callback<>() { + @Override + public void onResponse(@NonNull Call call, @NonNull Response res) { + if (res.isSuccessful()) { + // no content expected in body (code 204) + resultLiveData.postValue(new Result.Success<>(null)); + } else { + resultLiveData.postValue(new Result.Error<>( + "Error deleting mail: " + res.code()) + ); + } + } + + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable t) { + resultLiveData.postValue(new Result.Error<>(t.getMessage())); + } + } + ); + } + + /** + * Restores a mail from the trash by its ID. + * + * @param mailId The ID of the mail to restore + * @param status The trash flag status + * @param resultLiveData The LiveData object where the result will be posted + */ + public void restoreMail( + int mailId, + TrashStatus status, + MutableLiveData> resultLiveData) { + + resultLiveData.postValue(new Result.Loading<>()); + + mailApi.restoreMail(mailId, status).enqueue(new Callback<>() { + @Override + public void onResponse(@NonNull Call call, @NonNull Response response) { + if (response.isSuccessful()) { + resultLiveData.postValue(new Result.Success<>(null)); + } else { + resultLiveData.postValue(new Result.Error<>( + "Failed to restore mail: " + response.code()) + ); + } + } + + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable t) { + resultLiveData.postValue(new Result.Error<>(t.getMessage())); + + } + }); + } + + /** + * toggle a mail's spam flag by calling the backend's POST or DELETE /blacklist/:id endpoint. + * + * @param request contains the mail ID and user ID + * @param resultLiveData result live data to observe success or error + */ + public void markAsSpam(SpamRequest request, MutableLiveData> resultLiveData) { + resultLiveData.postValue(new Result.Loading<>()); + + mailApi.markAsSpam(request).enqueue(new Callback<>() { + @Override + public void onResponse(@NonNull Call call, @NonNull Response response) { + if (response.isSuccessful()) { + resultLiveData.postValue(new Result.Success<>(null)); + } else { + resultLiveData.postValue(new Result.Error<>( + "Failed to mark as spam: " + response.code()) + ); + } + } + + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable t) { + resultLiveData.postValue(new Result.Error<>(t.getMessage())); + } + }); + } + + /** + * Remove a mail from the spam list by calling DELETE /blacklist. + * + * @param request contains the mail ID and user ID + * @param resultLiveData result live data to observe success or error + */ + public void removeFromSpam(SpamRequest request, MutableLiveData> resultLiveData) { + resultLiveData.postValue(new Result.Loading<>()); + + mailApi.removeFromSpam(request).enqueue(new Callback<>() { + @Override + public void onResponse(@NonNull Call call, @NonNull Response response) { + if (response.isSuccessful()) { + resultLiveData.postValue(new Result.Success<>(null)); + } else { + resultLiveData.postValue(new Result.Error<>( + "Failed to remove from spam: " + response.code()) + ); + } + } + + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable t) { + resultLiveData.postValue(new Result.Error<>(t.getMessage())); + } + }); + } + + /** + * Toggles a mail's star flag. + * + * @param mailId The ID of the mail to un/star + * @param status The star flag status + * @param resultLiveData result live data to observe success or error + */ + public void toggleStar( + int mailId, + StarStatus status, + MutableLiveData> resultLiveData) { + resultLiveData.postValue(new Result.Loading<>()); + + mailApi.toggleStar(mailId, status).enqueue(new Callback<>() { + @Override + public void onResponse(@NonNull Call call, @NonNull Response response) { + if (response.isSuccessful()) { + resultLiveData.postValue(new Result.Success<>(null)); + } else { + resultLiveData.postValue(new Result.Error<>( + "Failed to toggle star: " + response.code()) + ); + } + } + + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable t) { + resultLiveData.postValue(new Result.Error<>(t.getMessage())); + } + }); + } + + /** + * Marks a mail as read. + * + * @param mailId The ID of the mail to un/star + * @param status The read flag status + * @param resultLiveData result live data to observe success or error + */ + public void markAsRead( + int mailId, + ReadStatus status, + MutableLiveData> resultLiveData) { + + resultLiveData.postValue(new Result.Loading<>()); + + mailApi.markAsRead(mailId, status).enqueue(new Callback<>() { + @Override + public void onResponse(@NonNull Call call, @NonNull Response response) { + if (response.isSuccessful()) { + resultLiveData.postValue(new Result.Success<>(null)); + } else { + resultLiveData.postValue(new Result.Error<>( + "Failed to toggle star: " + response.code()) + ); + } + } + + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable t) { + resultLiveData.postValue(new Result.Error<>(t.getMessage())); + } + }); + } + + /** + * Search mails using a query from the user. + * + * @param query string to search for in mails + * @param resultLiveData result live data to observe success or error + */ + public void searchMails(String query, MutableLiveData>> resultLiveData) { + resultLiveData.postValue(new Result.Loading<>()); + + mailApi.searchMails(query).enqueue(new Callback<>() { + @Override + public void onResponse(@NonNull Call> call, @NonNull Response> response) { + if (response.isSuccessful()) { + resultLiveData.postValue(new Result.Success<>(response.body())); + return; + } + resultLiveData.postValue(new Result.Error<>( + "Error searching mails: " + response.code()) + ); + } + + @Override + public void onFailure(@NonNull Call> call, @NonNull Throwable t) { + resultLiveData.postValue(new Result.Error<>(t.getMessage())); + } + }); + } + + // TODO Additional methods: sendNewMail + +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/utils/Result.java b/android_app/app/src/main/java/com/asp/android_app/utils/Result.java new file mode 100644 index 00000000..5982f54a --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/utils/Result.java @@ -0,0 +1,38 @@ +package com.asp.android_app.utils; + +/** + * Generic class representing a result of a data operation. + * Can be either a success (with data), an error (with message), or loading. + * + * @param the type of data expected on success + */ +public abstract class Result { + + /** + * Represents a successful result. + */ + public static final class Success extends Result { + public final T data; + + public Success(T data) { + this.data = data; + } + } + + /** + * Represents an error result. + */ + public static final class Error extends Result { + public final String message; + + public Error(String message) { + this.message = message; + } + } + + /** + * Represents a loading state (e.g. network call in progress). + */ + public static final class Loading extends Result { + } +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/viewmodel/MailViewModel.java b/android_app/app/src/main/java/com/asp/android_app/viewmodel/MailViewModel.java new file mode 100644 index 00000000..bdd8152b --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/viewmodel/MailViewModel.java @@ -0,0 +1,62 @@ +package com.asp.android_app.viewmodel; + +import android.app.Application; + +import androidx.annotation.NonNull; +import androidx.lifecycle.AndroidViewModel; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; + +import com.asp.android_app.model.Mail; +import com.asp.android_app.repository.MailRepository; +import com.asp.android_app.utils.Result; + +import java.util.List; + +/** + * ViewModel class for handling mail-related logic and exposing LiveData to the UI. + * Acts as a bridge between the Repository and UI layer. + */ +public class MailViewModel extends AndroidViewModel { + + private final MailRepository mailRepository; + + private final MutableLiveData>> mailsLiveData = new MutableLiveData<>(); + private int currentPage = 1; + + public MailViewModel(@NonNull Application application) { + super(application); + mailRepository = new MailRepository(application.getApplicationContext()); + } + + public LiveData>> getMailsLiveData() { + return mailsLiveData; + } + + /** + * Fetches mails for the given inbox type and current page. + * + * @param inboxType the inbox type ("incoming", "sent", etc.) + */ + public void loadMails(String inboxType) { + mailRepository.getMailsByType(inboxType, currentPage, mailsLiveData); + } + + public void nextPage(String inboxType) { + currentPage++; + loadMails(inboxType); + } + + public void previousPage(String inboxType) { + if (currentPage > 1) currentPage--; + loadMails(inboxType); + } + + public int getCurrentPage() { + return currentPage; + } + + public void resetPage() { + currentPage = 1; + } +} \ No newline at end of file diff --git a/android_app/app/src/main/res/layout/activity_inbox.xml b/android_app/app/src/main/res/layout/activity_inbox.xml index ef8c813c..0eb2aa52 100644 --- a/android_app/app/src/main/res/layout/activity_inbox.xml +++ b/android_app/app/src/main/res/layout/activity_inbox.xml @@ -5,6 +5,6 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".InboxActivity"> + tools:context=".activity.InboxActivity"> \ No newline at end of file diff --git a/android_app/app/src/main/res/layout/activity_main.xml b/android_app/app/src/main/res/layout/activity_main.xml index 93df62f0..0116f345 100644 --- a/android_app/app/src/main/res/layout/activity_main.xml +++ b/android_app/app/src/main/res/layout/activity_main.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:fitsSystemWindows="true" android:orientation="vertical" - tools:context=".MainActivity"> + tools:context=".activity.MainActivity"> From d18bb90f24a6dd74f04d8b86184abb213113c33f Mon Sep 17 00:00:00 2001 From: yuval Date: Thu, 31 Jul 2025 22:14:48 +0300 Subject: [PATCH 06/56] GA-126 changes to mail repo class --- .../repository/MailRepository.java | 215 +++--------------- 1 file changed, 36 insertions(+), 179 deletions(-) diff --git a/android_app/app/src/main/java/com/asp/android_app/repository/MailRepository.java b/android_app/app/src/main/java/com/asp/android_app/repository/MailRepository.java index ca026b48..6d77fc77 100644 --- a/android_app/app/src/main/java/com/asp/android_app/repository/MailRepository.java +++ b/android_app/app/src/main/java/com/asp/android_app/repository/MailRepository.java @@ -37,89 +37,34 @@ public MailRepository(Context context) { * * @param inboxType "incoming", "sent", "star", "trash", etc. * @param page current page number - * @param resultLiveData a LiveData object to observe result (success, error, loading) + * @param resultLiveData a LiveData object to observe result (mail list) */ - public void getMailsByType( - String inboxType, - int page, - MutableLiveData>> resultLiveData) { + public void getMailsByType(String inboxType, int page, MutableLiveData>> resultLiveData) { final int MAIL_LIMIT = 50; resultLiveData.postValue(new Result.Loading<>()); - - // GET mails by type - mailApi.getMailsByType(inboxType, page, MAIL_LIMIT).enqueue(new Callback<>() { - @Override - public void onResponse(@NonNull Call> call, @NonNull Response> res) { - if (res.isSuccessful()) { - resultLiveData.postValue(new Result.Success<>(res.body())); - return; - } - resultLiveData.postValue(new Result.Error<>("Error fetching mails: " + res.code())); - - } - - @Override - public void onFailure(@NonNull Call> call, @NonNull Throwable t) { - resultLiveData.postValue(new Result.Error<>(t.getMessage())); - } - }); + mailApi.getMailsByType(inboxType, page, MAIL_LIMIT).enqueue(createCallback(resultLiveData)); } /** * Fetch a mail by it's id. * * @param id id of the mail - * @param resultLiveData a LiveData object to observe result (success, error, loading) + * @param resultLiveData a LiveData object to observe result (mail object) */ public void fetchMail(int id, MutableLiveData> resultLiveData) { resultLiveData.postValue(new Result.Loading<>()); - - mailApi.fetchMail(id).enqueue(new Callback<>() { - @Override - public void onResponse(@NonNull Call call, @NonNull Response res) { - if (res.isSuccessful()) { - resultLiveData.postValue(new Result.Success<>(res.body())); - return; - } - resultLiveData.postValue(new Result.Error<>("Error fetching mail: " + res.code())); - } - - @Override - public void onFailure(@NonNull Call call, @NonNull Throwable t) { - resultLiveData.postValue(new Result.Error<>(t.getMessage())); - } - }); + mailApi.fetchMail(id).enqueue(createCallback(resultLiveData)); } /** * Delete a mail by its ID. * * @param mailId The ID of the mail to delete - * @param resultLiveData The LiveData object where the result will be posted + * @param resultLiveData a LivData object to observe result (void on success) */ public void deleteMail(int mailId, MutableLiveData> resultLiveData) { resultLiveData.postValue(new Result.Loading<>()); - - mailApi.deleteMail(mailId).enqueue( - new Callback<>() { - @Override - public void onResponse(@NonNull Call call, @NonNull Response res) { - if (res.isSuccessful()) { - // no content expected in body (code 204) - resultLiveData.postValue(new Result.Success<>(null)); - } else { - resultLiveData.postValue(new Result.Error<>( - "Error deleting mail: " + res.code()) - ); - } - } - - @Override - public void onFailure(@NonNull Call call, @NonNull Throwable t) { - resultLiveData.postValue(new Result.Error<>(t.getMessage())); - } - } - ); + mailApi.deleteMail(mailId).enqueue(createCallback(resultLiveData)); } /** @@ -127,33 +72,11 @@ public void onFailure(@NonNull Call call, @NonNull Throwable t) { * * @param mailId The ID of the mail to restore * @param status The trash flag status - * @param resultLiveData The LiveData object where the result will be posted + * @param resultLiveData a LiveData object to observe result (trash status result) */ - public void restoreMail( - int mailId, - TrashStatus status, - MutableLiveData> resultLiveData) { - + public void restoreMail(int mailId, TrashStatus status, MutableLiveData> resultLiveData) { resultLiveData.postValue(new Result.Loading<>()); - - mailApi.restoreMail(mailId, status).enqueue(new Callback<>() { - @Override - public void onResponse(@NonNull Call call, @NonNull Response response) { - if (response.isSuccessful()) { - resultLiveData.postValue(new Result.Success<>(null)); - } else { - resultLiveData.postValue(new Result.Error<>( - "Failed to restore mail: " + response.code()) - ); - } - } - - @Override - public void onFailure(@NonNull Call call, @NonNull Throwable t) { - resultLiveData.postValue(new Result.Error<>(t.getMessage())); - - } - }); + mailApi.restoreMail(mailId, status).enqueue(createCallback(resultLiveData)); } /** @@ -165,23 +88,7 @@ public void onFailure(@NonNull Call call, @NonNull Throwable t) { public void markAsSpam(SpamRequest request, MutableLiveData> resultLiveData) { resultLiveData.postValue(new Result.Loading<>()); - mailApi.markAsSpam(request).enqueue(new Callback<>() { - @Override - public void onResponse(@NonNull Call call, @NonNull Response response) { - if (response.isSuccessful()) { - resultLiveData.postValue(new Result.Success<>(null)); - } else { - resultLiveData.postValue(new Result.Error<>( - "Failed to mark as spam: " + response.code()) - ); - } - } - - @Override - public void onFailure(@NonNull Call call, @NonNull Throwable t) { - resultLiveData.postValue(new Result.Error<>(t.getMessage())); - } - }); + mailApi.markAsSpam(request).enqueue(createCallback(resultLiveData)); } /** @@ -192,24 +99,7 @@ public void onFailure(@NonNull Call call, @NonNull Throwable t) { */ public void removeFromSpam(SpamRequest request, MutableLiveData> resultLiveData) { resultLiveData.postValue(new Result.Loading<>()); - - mailApi.removeFromSpam(request).enqueue(new Callback<>() { - @Override - public void onResponse(@NonNull Call call, @NonNull Response response) { - if (response.isSuccessful()) { - resultLiveData.postValue(new Result.Success<>(null)); - } else { - resultLiveData.postValue(new Result.Error<>( - "Failed to remove from spam: " + response.code()) - ); - } - } - - @Override - public void onFailure(@NonNull Call call, @NonNull Throwable t) { - resultLiveData.postValue(new Result.Error<>(t.getMessage())); - } - }); + mailApi.removeFromSpam(request).enqueue(createCallback(resultLiveData)); } /** @@ -219,29 +109,9 @@ public void onFailure(@NonNull Call call, @NonNull Throwable t) { * @param status The star flag status * @param resultLiveData result live data to observe success or error */ - public void toggleStar( - int mailId, - StarStatus status, - MutableLiveData> resultLiveData) { + public void toggleStar(int mailId, StarStatus status, MutableLiveData> resultLiveData) { resultLiveData.postValue(new Result.Loading<>()); - - mailApi.toggleStar(mailId, status).enqueue(new Callback<>() { - @Override - public void onResponse(@NonNull Call call, @NonNull Response response) { - if (response.isSuccessful()) { - resultLiveData.postValue(new Result.Success<>(null)); - } else { - resultLiveData.postValue(new Result.Error<>( - "Failed to toggle star: " + response.code()) - ); - } - } - - @Override - public void onFailure(@NonNull Call call, @NonNull Throwable t) { - resultLiveData.postValue(new Result.Error<>(t.getMessage())); - } - }); + mailApi.toggleStar(mailId, status).enqueue(createCallback(resultLiveData)); } /** @@ -251,30 +121,10 @@ public void onFailure(@NonNull Call call, @NonNull Throwable t) { * @param status The read flag status * @param resultLiveData result live data to observe success or error */ - public void markAsRead( - int mailId, - ReadStatus status, - MutableLiveData> resultLiveData) { + public void markRead(int mailId, ReadStatus status, MutableLiveData> resultLiveData) { resultLiveData.postValue(new Result.Loading<>()); - - mailApi.markAsRead(mailId, status).enqueue(new Callback<>() { - @Override - public void onResponse(@NonNull Call call, @NonNull Response response) { - if (response.isSuccessful()) { - resultLiveData.postValue(new Result.Success<>(null)); - } else { - resultLiveData.postValue(new Result.Error<>( - "Failed to toggle star: " + response.code()) - ); - } - } - - @Override - public void onFailure(@NonNull Call call, @NonNull Throwable t) { - resultLiveData.postValue(new Result.Error<>(t.getMessage())); - } - }); + mailApi.markAsRead(mailId, status).enqueue(createCallback(resultLiveData)); } /** @@ -285,26 +135,33 @@ public void onFailure(@NonNull Call call, @NonNull Throwable t) { */ public void searchMails(String query, MutableLiveData>> resultLiveData) { resultLiveData.postValue(new Result.Loading<>()); + mailApi.searchMails(query).enqueue(createCallback(resultLiveData)); + } + + // TODO Additional methods: sendNewMail + - mailApi.searchMails(query).enqueue(new Callback<>() { + /** + * Helper class to centralize callback creation + * + * @param liveData result live data to show + * @return callback of type T + */ + private Callback createCallback(MutableLiveData> liveData) { + return new Callback<>() { @Override - public void onResponse(@NonNull Call> call, @NonNull Response> response) { + public void onResponse(@NonNull Call call, @NonNull Response response) { if (response.isSuccessful()) { - resultLiveData.postValue(new Result.Success<>(response.body())); - return; + liveData.postValue(new Result.Success<>(response.body())); + } else { + liveData.postValue(new Result.Error<>("Error: " + response.code())); } - resultLiveData.postValue(new Result.Error<>( - "Error searching mails: " + response.code()) - ); } @Override - public void onFailure(@NonNull Call> call, @NonNull Throwable t) { - resultLiveData.postValue(new Result.Error<>(t.getMessage())); + public void onFailure(@NonNull Call call, @NonNull Throwable t) { + liveData.postValue(new Result.Error<>(t.getMessage())); } - }); + }; } - - // TODO Additional methods: sendNewMail - } \ No newline at end of file From b848a3e45ee5a49f530281f2105f00c0ae4e6905 Mon Sep 17 00:00:00 2001 From: yuval Date: Thu, 31 Jul 2025 22:16:12 +0300 Subject: [PATCH 07/56] GA-126 changes to mail view model --- .../model/request/SpamRequest.java | 9 ++ .../android_app/viewmodel/MailViewModel.java | 115 +++++++++++++++++- 2 files changed, 121 insertions(+), 3 deletions(-) diff --git a/android_app/app/src/main/java/com/asp/android_app/model/request/SpamRequest.java b/android_app/app/src/main/java/com/asp/android_app/model/request/SpamRequest.java index 05b8f99b..d26ae870 100644 --- a/android_app/app/src/main/java/com/asp/android_app/model/request/SpamRequest.java +++ b/android_app/app/src/main/java/com/asp/android_app/model/request/SpamRequest.java @@ -8,6 +8,7 @@ */ public class SpamRequest { private int mailId; + private boolean isPreviouslySpam = false; /** * Constructs a request for marking or unmarking spam. @@ -31,4 +32,12 @@ public int getMailId() { public void setMailId(int mailId) { this.mailId = mailId; } + + public boolean getIsPreviouslySpam() { + return isPreviouslySpam; + } + + public void setIsPreviouslySpam(boolean isSpam) { + this.isPreviouslySpam = isSpam; + } } \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/viewmodel/MailViewModel.java b/android_app/app/src/main/java/com/asp/android_app/viewmodel/MailViewModel.java index bdd8152b..78aa3c38 100644 --- a/android_app/app/src/main/java/com/asp/android_app/viewmodel/MailViewModel.java +++ b/android_app/app/src/main/java/com/asp/android_app/viewmodel/MailViewModel.java @@ -8,6 +8,10 @@ import androidx.lifecycle.MutableLiveData; import com.asp.android_app.model.Mail; +import com.asp.android_app.model.request.SpamRequest; +import com.asp.android_app.model.response.ReadStatus; +import com.asp.android_app.model.response.StarStatus; +import com.asp.android_app.model.response.TrashStatus; import com.asp.android_app.repository.MailRepository; import com.asp.android_app.utils.Result; @@ -21,7 +25,15 @@ public class MailViewModel extends AndroidViewModel { private final MailRepository mailRepository; - private final MutableLiveData>> mailsLiveData = new MutableLiveData<>(); + private final MutableLiveData>> mailsListLiveData = new MutableLiveData<>(); + private final MutableLiveData> mailLiveData = new MutableLiveData<>(); + private final MutableLiveData> deleteMailStatus = new MutableLiveData<>(); + private final MutableLiveData> restoreMailStatus = new MutableLiveData<>(); + private final MutableLiveData> readMailStatus = new MutableLiveData<>(); + private final MutableLiveData> spamMailStatus = new MutableLiveData<>(); + private final MutableLiveData> notSpamMailStatus = new MutableLiveData<>(); + private final MutableLiveData> toggleStarMailStatus = new MutableLiveData<>(); + private int currentPage = 1; public MailViewModel(@NonNull Application application) { @@ -30,7 +42,31 @@ public MailViewModel(@NonNull Application application) { } public LiveData>> getMailsLiveData() { - return mailsLiveData; + return mailsListLiveData; + } + + public LiveData> getMailLiveData() { + return mailLiveData; + } + + public LiveData> getDeleteMailStatus() { + return deleteMailStatus; + } + + public LiveData> getRestoreMailStatus() { + return restoreMailStatus; + } + + public LiveData> getSpamMailStatus() { + return spamMailStatus; + } + + public LiveData> getReadMailStatus() { + return readMailStatus; + } + + public LiveData> getStarStatus() { + return toggleStarMailStatus; } /** @@ -39,7 +75,7 @@ public LiveData>> getMailsLiveData() { * @param inboxType the inbox type ("incoming", "sent", etc.) */ public void loadMails(String inboxType) { - mailRepository.getMailsByType(inboxType, currentPage, mailsLiveData); + mailRepository.getMailsByType(inboxType, currentPage, mailsListLiveData); } public void nextPage(String inboxType) { @@ -59,4 +95,77 @@ public int getCurrentPage() { public void resetPage() { currentPage = 1; } + + /** + * Fetches a mail with a given id + * + * @param mailId mail id to fetch + */ + public void fetchMailById(int mailId) { + mailRepository.fetchMail(mailId, mailLiveData); + } + + /** + * Moves the mail with the given ID to the trash and updates LiveData. + * + * @param mailId The ID of the mail to delete + */ + public void deleteMail(int mailId) { + mailRepository.deleteMail(mailId, deleteMailStatus); + } + + /** + * Restores the mail with the given ID from the trash and updates LiveData. + * + * @param mailId The ID of the mail to restore + */ + public void restoreMail(int mailId, TrashStatus status) { + mailRepository.restoreMail(mailId, status, restoreMailStatus); + } + + /** + * Toggle the mail with the given ID spam flag and updates LiveData. + * + * @param request object containing the mail id to toggle it's spam flag + */ + public void toggleSpam(SpamRequest request) { + if (request.getIsPreviouslySpam()) { + mailRepository.removeFromSpam(request, spamMailStatus); + } else { + mailRepository.markAsSpam(request, spamMailStatus); + } + } + + + /** + * Toggles the star flag of a mail + * + * @param mailId id of the mail to toggle the star flag for + * @param status status of the star flag of a mail + */ + public void toggleStar(int mailId, StarStatus status) { + mailRepository.toggleStar(mailId, status, toggleStarMailStatus); + } + + /** + * Marks the read flag of a mail as true + * + * @param mailId id of the mail to mark the read flag as true + * @param status status of the read flag of a mail + */ + public void markAsRead(int mailId, ReadStatus status) { + mailRepository.markRead(mailId, status, readMailStatus); + } + + /** + * Searches for emails with a given string + * + * @param query string to search by + */ + public void searchMail(String query) { + mailRepository.searchMails(query, mailsListLiveData); + } + + // TODO Additional methods: sendNewMail + } \ No newline at end of file From 9959d2063aaf3b3a00c7452f61954ff40e5da064 Mon Sep 17 00:00:00 2001 From: yuval Date: Thu, 31 Jul 2025 22:19:47 +0300 Subject: [PATCH 08/56] GA-126 repo and view model for users --- .../repository/UserRepository.java | 70 +++++++++++++++++++ .../android_app/viewmodel/UserViewModel.java | 51 ++++++++++++++ 2 files changed, 121 insertions(+) create mode 100644 android_app/app/src/main/java/com/asp/android_app/repository/UserRepository.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/viewmodel/UserViewModel.java diff --git a/android_app/app/src/main/java/com/asp/android_app/repository/UserRepository.java b/android_app/app/src/main/java/com/asp/android_app/repository/UserRepository.java new file mode 100644 index 00000000..977fc800 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/repository/UserRepository.java @@ -0,0 +1,70 @@ +package com.asp.android_app.repository; + +import android.content.Context; + +import androidx.annotation.NonNull; +import androidx.lifecycle.MutableLiveData; + +import com.asp.android_app.api.ApiClient; +import com.asp.android_app.api.UserApi; +import com.asp.android_app.model.User; +import com.asp.android_app.model.request.LoginRequest; +import com.asp.android_app.model.response.AuthResponse; +import com.asp.android_app.model.response.UserInfo; +import com.asp.android_app.utils.Result; + +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; + +/** + * Repository class for user related operations such as login, registration, and profile fetch. + */ +public class UserRepository { + + private final UserApi userApi; + + public UserRepository(Context context) { + userApi = ApiClient.getClient(context).create(UserApi.class); + } + + public void login(LoginRequest request, MutableLiveData> resultLiveData) { + resultLiveData.postValue(new Result.Loading<>()); + userApi.login(request).enqueue(createCallback(resultLiveData)); + } + + public void register(User user, MutableLiveData> resultLiveData) { + resultLiveData.postValue(new Result.Loading<>()); + userApi.register(user).enqueue(createCallback(resultLiveData)); + } + + public void fetchUserInfo(int userId, MutableLiveData> resultLiveData) { + resultLiveData.postValue(new Result.Loading<>()); + userApi.fetchUserInfo(userId).enqueue(createCallback(resultLiveData)); + } + + + /** + * Helper class to centralize callback creation + * + * @param liveData result live data to show + * @return callback of type T + */ + private Callback createCallback(MutableLiveData> liveData) { + return new Callback<>() { + @Override + public void onResponse(@NonNull Call call, @NonNull Response response) { + if (response.isSuccessful()) { + liveData.postValue(new Result.Success<>(response.body())); + } else { + liveData.postValue(new Result.Error<>("Error: " + response.code())); + } + } + + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable t) { + liveData.postValue(new Result.Error<>(t.getMessage())); + } + }; + } +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/viewmodel/UserViewModel.java b/android_app/app/src/main/java/com/asp/android_app/viewmodel/UserViewModel.java new file mode 100644 index 00000000..4874af13 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/viewmodel/UserViewModel.java @@ -0,0 +1,51 @@ +package com.asp.android_app.viewmodel; + +import android.app.Application; + +import androidx.annotation.NonNull; +import androidx.lifecycle.AndroidViewModel; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; + +import com.asp.android_app.model.User; +import com.asp.android_app.model.request.LoginRequest; +import com.asp.android_app.model.response.AuthResponse; +import com.asp.android_app.model.response.UserInfo; +import com.asp.android_app.repository.UserRepository; +import com.asp.android_app.utils.Result; + +/** + * ViewModel class for handling user authentication and profile management. + */ +public class UserViewModel extends AndroidViewModel { + + private final UserRepository userRepository; + + private final MutableLiveData> authResult = new MutableLiveData<>(); + private final MutableLiveData> userInfoResult = new MutableLiveData<>(); + + public UserViewModel(@NonNull Application application) { + super(application); + userRepository = new UserRepository(application.getApplicationContext()); + } + + public LiveData> getAuthResult() { + return authResult; + } + + public LiveData> getUserInfoResult() { + return userInfoResult; + } + + public void login(LoginRequest request) { + userRepository.login(request, authResult); + } + + public void register(User user) { + userRepository.register(user, authResult); + } + + public void fetchUserInfo(int userId) { + userRepository.fetchUserInfo(userId, userInfoResult); + } +} \ No newline at end of file From e7e5c507f31f7e7138dcac274ee365b23250add0 Mon Sep 17 00:00:00 2001 From: yuval Date: Thu, 31 Jul 2025 22:40:22 +0300 Subject: [PATCH 09/56] GA-127 basic UI login fragment --- android_app/app/src/main/AndroidManifest.xml | 5 +- .../android_app/activity/MainActivity.java | 20 ---- .../model/response/AuthResponse.java | 12 ++- .../{activity => ui}/InboxActivity.java | 2 +- .../ui/auth_activity/AuthActivity.java | 26 +++++ .../ui/auth_activity/LoginFragment.java | 92 ++++++++++++++++ .../ui/auth_activity/SignupFragment.java | 31 ++++++ .../com/asp/android_app/utils/Result.java | 12 ++- .../app/src/main/res/drawable/logo192.png | Bin 0 -> 19781 bytes .../{activity_main.xml => activity_auth.xml} | 9 +- .../src/main/res/layout/activity_inbox.xml | 2 +- .../src/main/res/layout/login_fragment.xml | 98 ++++++++++++++++++ .../src/main/res/layout/signup_fragment.xml | 7 ++ .../app/src/main/res/values/themes.xml | 4 +- .../main/res/xml/network_security_config.xml | 6 ++ 15 files changed, 292 insertions(+), 34 deletions(-) delete mode 100644 android_app/app/src/main/java/com/asp/android_app/activity/MainActivity.java rename android_app/app/src/main/java/com/asp/android_app/{activity => ui}/InboxActivity.java (89%) create mode 100644 android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/AuthActivity.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/LoginFragment.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/SignupFragment.java create mode 100644 android_app/app/src/main/res/drawable/logo192.png rename android_app/app/src/main/res/layout/{activity_main.xml => activity_auth.xml} (53%) create mode 100644 android_app/app/src/main/res/layout/login_fragment.xml create mode 100644 android_app/app/src/main/res/layout/signup_fragment.xml create mode 100644 android_app/app/src/main/res/xml/network_security_config.xml diff --git a/android_app/app/src/main/AndroidManifest.xml b/android_app/app/src/main/AndroidManifest.xml index d166515b..693b2128 100644 --- a/android_app/app/src/main/AndroidManifest.xml +++ b/android_app/app/src/main/AndroidManifest.xml @@ -1,6 +1,7 @@ + diff --git a/android_app/app/src/main/java/com/asp/android_app/activity/MainActivity.java b/android_app/app/src/main/java/com/asp/android_app/activity/MainActivity.java deleted file mode 100644 index cd128830..00000000 --- a/android_app/app/src/main/java/com/asp/android_app/activity/MainActivity.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.asp.android_app.activity; - -import android.os.Bundle; - -import androidx.appcompat.app.AppCompatActivity; - -import com.asp.android_app.R; - -public class MainActivity extends AppCompatActivity { - - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - - - } - -} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/model/response/AuthResponse.java b/android_app/app/src/main/java/com/asp/android_app/model/response/AuthResponse.java index 9c9b2be1..ccb93965 100644 --- a/android_app/app/src/main/java/com/asp/android_app/model/response/AuthResponse.java +++ b/android_app/app/src/main/java/com/asp/android_app/model/response/AuthResponse.java @@ -13,6 +13,11 @@ public class AuthResponse { */ private String token; + /** + * User object returned in the JSON from the backend + */ + private UserInfo user; + /** * @return JWT token returned by the server */ @@ -21,9 +26,10 @@ public String getToken() { } /** - * @param token JWT token to assign + * @return user object from the server */ - public void setToken(String token) { - this.token = token; + public UserInfo getUser() { + return user; } + } \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/activity/InboxActivity.java b/android_app/app/src/main/java/com/asp/android_app/ui/InboxActivity.java similarity index 89% rename from android_app/app/src/main/java/com/asp/android_app/activity/InboxActivity.java rename to android_app/app/src/main/java/com/asp/android_app/ui/InboxActivity.java index 8fca773c..909a25bb 100644 --- a/android_app/app/src/main/java/com/asp/android_app/activity/InboxActivity.java +++ b/android_app/app/src/main/java/com/asp/android_app/ui/InboxActivity.java @@ -1,4 +1,4 @@ -package com.asp.android_app.activity; +package com.asp.android_app.ui; import android.os.Bundle; diff --git a/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/AuthActivity.java b/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/AuthActivity.java new file mode 100644 index 00000000..b893a537 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/AuthActivity.java @@ -0,0 +1,26 @@ +package com.asp.android_app.ui.auth_activity; + +import android.os.Bundle; + +import androidx.appcompat.app.AppCompatActivity; + +import com.asp.android_app.R; + +public class AuthActivity extends AppCompatActivity { + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_auth); + + if (savedInstanceState == null) { + getSupportFragmentManager() + .beginTransaction() + .replace(R.id.fragment_container, new LoginFragment()) + .commit(); + } + + } + +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/LoginFragment.java b/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/LoginFragment.java new file mode 100644 index 00000000..af4a238c --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/LoginFragment.java @@ -0,0 +1,92 @@ +package com.asp.android_app.ui.auth_activity; + +import android.content.Intent; +import android.os.Bundle; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; + +import androidx.fragment.app.Fragment; +import androidx.lifecycle.MutableLiveData; + +import com.asp.android_app.R; +import com.asp.android_app.model.request.LoginRequest; +import com.asp.android_app.model.response.AuthResponse; +import com.asp.android_app.repository.UserRepository; +import com.asp.android_app.ui.InboxActivity; +import com.asp.android_app.utils.Result; + +public class LoginFragment extends Fragment { + + public LoginFragment() { + } + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.login_fragment, container, false); + + // Initialize views + Toast.makeText(inflater.getContext(), "LOGIN", Toast.LENGTH_SHORT).show(); + Button btnSwitch = view.findViewById(R.id.btnSignup); + Button btnLogin = view.findViewById(R.id.btnLogin); + EditText etAddress = view.findViewById(R.id.etAddress); + EditText etPassword = view.findViewById(R.id.etPassword); + + // Initialize the repository class + UserRepository userRepository = new UserRepository(requireContext()); + + // Handle signup button clicks - change to the signup fragment + btnSwitch.setOnClickListener(v -> { + requireActivity().getSupportFragmentManager() + .beginTransaction() + .replace(R.id.fragment_container, new SignupFragment()) + .addToBackStack(null) + .commit(); + }); + + // Handle login button clicks - navigate to the inbox activity + btnLogin.setOnClickListener(view1 -> { + onLoginCLick(etAddress, etPassword, userRepository); + }); + + return view; + } + + private void onLoginCLick(EditText etAddress, EditText etPassword, UserRepository repo) { + String address = etAddress.getText().toString().trim(); + String password = etPassword.getText().toString().trim(); + + /// TODO replace with more modern UI change + if (address.isEmpty() || password.isEmpty()) { + Toast.makeText(getContext(), "Please fill in all fields", Toast.LENGTH_SHORT).show(); + return; + } + + LoginRequest request = new LoginRequest(address, password); + MutableLiveData> resultLiveData = new MutableLiveData<>(); + + resultLiveData.observe(getViewLifecycleOwner(), result -> { + if (result instanceof Result.Loading) { + /// TODO show loading + Toast.makeText(getContext(), "LOADING", Toast.LENGTH_SHORT).show(); + } else if (result instanceof Result.Success) { + AuthResponse auth = ((Result.Success) result).getData(); + Toast.makeText(getContext(), "Welcome " + auth.getUser().getFullName(), Toast.LENGTH_SHORT).show(); + startActivity(new Intent(getContext(), InboxActivity.class)); + requireActivity().finish(); + } else if (result instanceof Result.Error) { + Log.i("login:", ((Result.Error) result).getMessage()); + Toast.makeText(getContext(), "Login failed: " + ((Result.Error) result).getMessage(), Toast.LENGTH_LONG).show(); + } + }); + + repo.login(request, resultLiveData); + } + +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/SignupFragment.java b/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/SignupFragment.java new file mode 100644 index 00000000..4d8aa4b4 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/SignupFragment.java @@ -0,0 +1,31 @@ +package com.asp.android_app.ui.auth_activity; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.fragment.app.Fragment; + +import com.asp.android_app.R; + +public class SignupFragment extends Fragment { + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.signup_fragment, container, false); + + /* + Button btnSwitch = view.findViewById(R.id.btn_to_first); + btnSwitch.setOnClickListener(v -> { + requireActivity().getSupportFragmentManager() + .beginTransaction() + .replace(R.id.fragment_container, new FirstFragment()) + .addToBackStack(null) + .commit(); + });*/ + + return view; + } +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/utils/Result.java b/android_app/app/src/main/java/com/asp/android_app/utils/Result.java index 5982f54a..5e5477c7 100644 --- a/android_app/app/src/main/java/com/asp/android_app/utils/Result.java +++ b/android_app/app/src/main/java/com/asp/android_app/utils/Result.java @@ -12,22 +12,30 @@ public abstract class Result { * Represents a successful result. */ public static final class Success extends Result { - public final T data; + private final T data; public Success(T data) { this.data = data; } + + public T getData() { + return data; + } } /** * Represents an error result. */ public static final class Error extends Result { - public final String message; + private final String message; public Error(String message) { this.message = message; } + + public String getMessage() { + return message; + } } /** diff --git a/android_app/app/src/main/res/drawable/logo192.png b/android_app/app/src/main/res/drawable/logo192.png new file mode 100644 index 0000000000000000000000000000000000000000..60708bc14c258d78e8aef9bea6e5c8740b0a77f7 GIT binary patch literal 19781 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 sVC9bc_MYb# - + tools:context=".ui.auth_activity.AuthActivity"> + \ No newline at end of file diff --git a/android_app/app/src/main/res/layout/activity_inbox.xml b/android_app/app/src/main/res/layout/activity_inbox.xml index 0eb2aa52..346b53e8 100644 --- a/android_app/app/src/main/res/layout/activity_inbox.xml +++ b/android_app/app/src/main/res/layout/activity_inbox.xml @@ -5,6 +5,6 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".activity.InboxActivity"> + tools:context=".ui.InboxActivity"> \ No newline at end of file diff --git a/android_app/app/src/main/res/layout/login_fragment.xml b/android_app/app/src/main/res/layout/login_fragment.xml new file mode 100644 index 00000000..7bd94bba --- /dev/null +++ b/android_app/app/src/main/res/layout/login_fragment.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/layout/signup_fragment.xml b/android_app/app/src/main/res/layout/signup_fragment.xml new file mode 100644 index 00000000..d829e291 --- /dev/null +++ b/android_app/app/src/main/res/layout/signup_fragment.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/values/themes.xml b/android_app/app/src/main/res/values/themes.xml index 9384ee0b..a331adaf 100644 --- a/android_app/app/src/main/res/values/themes.xml +++ b/android_app/app/src/main/res/values/themes.xml @@ -1,6 +1,6 @@ - + - + + + + + + + + + + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/values/themes.xml b/android_app/app/src/main/res/values/themes.xml index a331adaf..00bda67e 100644 --- a/android_app/app/src/main/res/values/themes.xml +++ b/android_app/app/src/main/res/values/themes.xml @@ -2,8 +2,8 @@ + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/values-night/themes.xml b/android_app/app/src/main/res/values-night/themes.xml index 910cdd56..265a3600 100644 --- a/android_app/app/src/main/res/values-night/themes.xml +++ b/android_app/app/src/main/res/values-night/themes.xml @@ -10,7 +10,7 @@ @color/teal_200 @color/black - ?attr/colorPrimaryVariant + @android:color/transparent diff --git a/android_app/app/src/main/res/values/styles.xml b/android_app/app/src/main/res/values/styles.xml index 4c63de7d..4e06fa71 100644 --- a/android_app/app/src/main/res/values/styles.xml +++ b/android_app/app/src/main/res/values/styles.xml @@ -21,6 +21,8 @@ From 05f4ec2ad5db787f8fe023f7dc01e72b3c2c379e Mon Sep 17 00:00:00 2001 From: yuval Date: Fri, 1 Aug 2025 18:06:54 +0300 Subject: [PATCH 13/56] GA-127 error fixes --- .../ui/auth_activity/LoginFragment.java | 28 +++++++++++++------ .../app/src/main/res/values/strings.xml | 1 + 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/LoginFragment.java b/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/LoginFragment.java index dec9490d..29fc8bb6 100644 --- a/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/LoginFragment.java +++ b/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/LoginFragment.java @@ -14,7 +14,7 @@ import android.widget.Toast; import androidx.fragment.app.Fragment; -import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModelProvider; import com.asp.android_app.R; import com.asp.android_app.model.request.LoginRequest; @@ -23,6 +23,7 @@ import com.asp.android_app.ui.InboxActivity; import com.asp.android_app.utils.Result; import com.asp.android_app.utils.TokenManager; +import com.asp.android_app.viewmodel.UserViewModel; import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; @@ -31,12 +32,16 @@ public class LoginFragment extends Fragment { public LoginFragment() { } + UserViewModel userViewModel; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view = inflater.inflate(R.layout.login_fragment, container, false); + // Initialize the view model class + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + // Initialize views Button btnSwitch = view.findViewById(R.id.btnSignup); Button btnLogin = view.findViewById(R.id.btnLogin); @@ -122,11 +127,12 @@ private void onLoginCLick( return; LoginRequest request = new LoginRequest(mail, password); - MutableLiveData> resultLiveData = new MutableLiveData<>(); + userViewModel.login(request); - resultLiveData.observe(getViewLifecycleOwner(), result -> { + // wait for results + userViewModel.getAuthResult().observe(getViewLifecycleOwner(), result -> { if (result instanceof Result.Loading) { - /// TODO show loading + // TODO show loading Toast.makeText(getContext(), "LOADING", Toast.LENGTH_SHORT).show(); } else if (result instanceof Result.Success) { AuthResponse auth = ((Result.Success) result).getData(); @@ -136,8 +142,6 @@ private void onLoginCLick( handleLoginError(msg, passwordLayout, etPassword); } }); - - repo.login(request, resultLiveData); } /** @@ -172,10 +176,18 @@ private void handleLoginError(String msg, TextInputLayout layout, TextInputEditT } // check if the server is up if (msg.contains("Failed to connect")) { - Toast.makeText(requireContext(), getResources().getString(R.string.server_off), Toast.LENGTH_SHORT).show(); + Toast.makeText( + requireContext(), + getResources().getString(R.string.server_off), + Toast.LENGTH_SHORT + ).show(); return; } - Toast.makeText(requireContext(), "Unexpected Error, try again", Toast.LENGTH_SHORT).show(); + Toast.makeText( + requireContext(), + getResources().getString(R.string.unexpected_error), + Toast.LENGTH_SHORT + ).show(); } } \ No newline at end of file diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml index 6ae528ac..636cc97c 100644 --- a/android_app/app/src/main/res/values/strings.xml +++ b/android_app/app/src/main/res/values/strings.xml @@ -3,6 +3,7 @@ Server is down, try again later Logo Profile Image + Unexpected Error, try again Invalid name From 6ff96643a77d9970555e893cf48732383bab1266 Mon Sep 17 00:00:00 2001 From: yuval Date: Fri, 1 Aug 2025 18:49:52 +0300 Subject: [PATCH 14/56] GA-128 inbox screen ui and logic --- android_app/app/build.gradle | 1 + android_app/app/src/main/AndroidManifest.xml | 2 +- .../java/com/asp/android_app/api/MailApi.java | 10 +- .../java/com/asp/android_app/model/Mail.java | 80 +++-------- .../model/response/Attachment.java | 25 ++++ .../model/response/MailListResponse.java | 13 ++ .../android_app/model/response/UserInfo.java | 86 +++++++++++- .../repository/MailRepository.java | 7 +- .../com/asp/android_app/ui/InboxActivity.java | 19 --- .../ui/auth_activity/LoginFragment.java | 6 +- .../ui/auth_activity/SignupFragment.java | 2 +- .../ui/inbox_activity/InboxActivity.java | 94 +++++++++++++ .../ui/inbox_activity/InboxFragment.java | 83 ++++++++++++ .../ui/inbox_activity/MailAdapter.java | 126 ++++++++++++++++++ .../android_app/utils/Base64Converter.java | 23 +++- .../android_app/viewmodel/MailViewModel.java | 7 +- .../main/res/drawable/circle_background.xml | 5 + .../drawable/circle_selected_background.xml | 5 + .../src/main/res/drawable/ic_checkmark.xml | 11 ++ .../app/src/main/res/drawable/ic_menu.xml | 12 ++ .../app/src/main/res/drawable/ic_search.xml | 11 ++ .../src/main/res/layout/activity_inbox.xml | 82 +++++++++++- .../src/main/res/layout/inbox_fragment.xml | 15 +++ .../app/src/main/res/layout/mail_item.xml | 79 +++++++++++ .../app/src/main/res/menu/drawer_menu.xml | 32 +++++ .../app/src/main/res/values-night/styles.xml | 6 + .../app/src/main/res/values-night/themes.xml | 5 +- .../app/src/main/res/values/strings.xml | 21 +++ .../app/src/main/res/values/styles.xml | 59 ++++++++ .../app/src/main/res/values/themes.xml | 3 +- android_app/gradle/libs.versions.toml | 3 + 31 files changed, 824 insertions(+), 109 deletions(-) create mode 100644 android_app/app/src/main/java/com/asp/android_app/model/response/Attachment.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/model/response/MailListResponse.java delete mode 100644 android_app/app/src/main/java/com/asp/android_app/ui/InboxActivity.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/InboxActivity.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/InboxFragment.java create mode 100644 android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/MailAdapter.java create mode 100644 android_app/app/src/main/res/drawable/circle_background.xml create mode 100644 android_app/app/src/main/res/drawable/circle_selected_background.xml create mode 100644 android_app/app/src/main/res/drawable/ic_checkmark.xml create mode 100644 android_app/app/src/main/res/drawable/ic_menu.xml create mode 100644 android_app/app/src/main/res/drawable/ic_search.xml create mode 100644 android_app/app/src/main/res/layout/inbox_fragment.xml create mode 100644 android_app/app/src/main/res/layout/mail_item.xml create mode 100644 android_app/app/src/main/res/menu/drawer_menu.xml diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle index 08d89adc..ee7989ab 100644 --- a/android_app/app/build.gradle +++ b/android_app/app/build.gradle @@ -39,6 +39,7 @@ dependencies { implementation libs.navigation.fragment implementation libs.navigation.ui implementation libs.activity + implementation libs.swiperefreshlayout testImplementation libs.junit androidTestImplementation libs.ext.junit androidTestImplementation libs.espresso.core diff --git a/android_app/app/src/main/AndroidManifest.xml b/android_app/app/src/main/AndroidManifest.xml index f0fba560..1a46dbbc 100644 --- a/android_app/app/src/main/AndroidManifest.xml +++ b/android_app/app/src/main/AndroidManifest.xml @@ -19,7 +19,7 @@ android:name=".ui.auth_activity.AuthActivity" android:exported="false" /> diff --git a/android_app/app/src/main/java/com/asp/android_app/api/MailApi.java b/android_app/app/src/main/java/com/asp/android_app/api/MailApi.java index db7181c9..da02127d 100644 --- a/android_app/app/src/main/java/com/asp/android_app/api/MailApi.java +++ b/android_app/app/src/main/java/com/asp/android_app/api/MailApi.java @@ -1,13 +1,12 @@ package com.asp.android_app.api; import com.asp.android_app.model.Mail; -import com.asp.android_app.model.response.ReadStatus; import com.asp.android_app.model.request.SpamRequest; +import com.asp.android_app.model.response.MailListResponse; +import com.asp.android_app.model.response.ReadStatus; import com.asp.android_app.model.response.StarStatus; import com.asp.android_app.model.response.TrashStatus; -import java.util.List; - import retrofit2.Call; import retrofit2.http.Body; import retrofit2.http.DELETE; @@ -28,7 +27,7 @@ public interface MailApi { Call fetchMail(@Path("id") int id); @GET("mails") - Call> getMailsByType( + Call getMailsByType( @Query("inboxType") String inboxType, @Query("page") int page, @Query("limit") int limit @@ -53,6 +52,5 @@ Call> getMailsByType( Call restoreMail(@Path("id") int id, @Body TrashStatus status); @GET("mails/search/{query}") - Call> searchMails(@Path("query") String query); + Call searchMails(@Path("query") String query); } - diff --git a/android_app/app/src/main/java/com/asp/android_app/model/Mail.java b/android_app/app/src/main/java/com/asp/android_app/model/Mail.java index b951b1bf..83f0d435 100644 --- a/android_app/app/src/main/java/com/asp/android_app/model/Mail.java +++ b/android_app/app/src/main/java/com/asp/android_app/model/Mail.java @@ -1,5 +1,9 @@ package com.asp.android_app.model; +import com.asp.android_app.model.response.Attachment; +import com.asp.android_app.model.response.UserInfo; + +import java.util.List; /** * Represents an email message. @@ -10,16 +14,19 @@ */ public class Mail { private int id; - private int senderId; - private String senderName; - private String senderMail; + private int owner; + private UserInfo from; + private List sentTo; private String subject; private String body; - private String timestamp; + private String sentAt; + private String createdAt; + private boolean isDraft; private boolean isRead; private boolean isStarred; private boolean isTrashed; private boolean isSpam; + private List files; /** * @return the unique ID of the mail @@ -36,45 +43,17 @@ public void setId(int id) { } /** - * @return the sender's user ID - */ - public int getSenderId() { - return senderId; - } - - /** - * @param senderId the sender's user ID + * @return the sender user object */ - public void setSenderId(int senderId) { - this.senderId = senderId; + public UserInfo getSender() { + return from; } /** - * @return the full name of the sender + * @return list of users the mail was sent to */ - public String getSenderName() { - return senderName; - } - - /** - * @param senderName the full name of the sender - */ - public void setSenderName(String senderName) { - this.senderName = senderName; - } - - /** - * @return the email address of the sender - */ - public String getSenderMail() { - return senderMail; - } - - /** - * @param senderMail the sender's email address - */ - public void setSenderMail(String senderMail) { - this.senderMail = senderMail; + public List getSentTo() { + return sentTo; } /** @@ -108,29 +87,8 @@ public void setBody(String body) { /** * @return timestamp string of when the mail was sent */ - public String getTimestamp() { - return timestamp; - } - - /** - * @param timestamp timestamp string of when the mail was sent - */ - public void setTimestamp(String timestamp) { - this.timestamp = timestamp; - } - - /** - * @return true if the mail has been read - */ - public boolean isRead() { - return isRead; - } - - /** - * @param read whether the mail has been read - */ - public void setRead(boolean read) { - isRead = read; + public String getSentAt() { + return sentAt; } /** diff --git a/android_app/app/src/main/java/com/asp/android_app/model/response/Attachment.java b/android_app/app/src/main/java/com/asp/android_app/model/response/Attachment.java new file mode 100644 index 00000000..d34d8e65 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/model/response/Attachment.java @@ -0,0 +1,25 @@ +package com.asp.android_app.model.response; + +/** + * Class to represent an attachment (file) sent in mails + */ +public class Attachment { + + /** + * File name + */ + private String name; + + /** + * File data in base64 format + */ + private String data; + + public String getName() { + return name; + } + + public String getData() { + return data; + } +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/model/response/MailListResponse.java b/android_app/app/src/main/java/com/asp/android_app/model/response/MailListResponse.java new file mode 100644 index 00000000..6df35623 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/model/response/MailListResponse.java @@ -0,0 +1,13 @@ +package com.asp.android_app.model.response; + +import com.asp.android_app.model.Mail; + +import java.util.List; + +public class MailListResponse { + private List mails; + + public List getMails() { + return mails; + } +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/model/response/UserInfo.java b/android_app/app/src/main/java/com/asp/android_app/model/response/UserInfo.java index cd5db49b..e042d1fe 100644 --- a/android_app/app/src/main/java/com/asp/android_app/model/response/UserInfo.java +++ b/android_app/app/src/main/java/com/asp/android_app/model/response/UserInfo.java @@ -1,11 +1,24 @@ package com.asp.android_app.model.response; +import android.os.Parcel; +import android.os.Parcelable; + /** * Represents basic public profile information for a user. * Used in: * - GET /users/{id} */ -public class UserInfo { +public class UserInfo implements Parcelable { + + /** + * User id in the backend + */ + private final int id; + + /** + * Mail address of a user + */ + private final String mail; /** * The full name of the user. @@ -15,7 +28,36 @@ public class UserInfo { /** * The URL to the user's profile image. */ - private String imageUrl; + private String image; + + /** + * Birthday of a user + */ + private final String dateOfBirth; + + + // Constructor from Parcel + protected UserInfo(Parcel in) { + id = in.readInt(); + mail = in.readString(); + fullName = in.readString(); + image = in.readString(); + dateOfBirth = in.readString(); + } + + /** + * @return id of the user + */ + public int getId() { + return id; + } + + /** + * @return mail address of the user + */ + public String getMail() { + return mail; + } /** * @return full name of the user @@ -35,13 +77,49 @@ public void setFullName(String fullName) { * @return profile image URL */ public String getImageUrl() { - return imageUrl; + return image; } /** * @param imageUrl URL of the profile image */ public void setImageUrl(String imageUrl) { - this.imageUrl = imageUrl; + this.image = imageUrl; + } + + /** + * @return user's date of birth + */ + public String getDateOfBirth() { + return this.dateOfBirth; } + + public static final Creator CREATOR = new Creator() { + @Override + public UserInfo createFromParcel(Parcel in) { + return new UserInfo(in); + } + + @Override + public UserInfo[] newArray(int size) { + return new UserInfo[size]; + } + }; + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel parcel, int flags) { + parcel.writeInt(id); + parcel.writeString(mail); + parcel.writeString(fullName); + parcel.writeString(image); + parcel.writeString(dateOfBirth); + } + + // Optional: default constructor if needed elsewhere + } \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/repository/MailRepository.java b/android_app/app/src/main/java/com/asp/android_app/repository/MailRepository.java index 6d77fc77..fbfd8218 100644 --- a/android_app/app/src/main/java/com/asp/android_app/repository/MailRepository.java +++ b/android_app/app/src/main/java/com/asp/android_app/repository/MailRepository.java @@ -9,13 +9,12 @@ import com.asp.android_app.api.MailApi; import com.asp.android_app.model.Mail; import com.asp.android_app.model.request.SpamRequest; +import com.asp.android_app.model.response.MailListResponse; import com.asp.android_app.model.response.ReadStatus; import com.asp.android_app.model.response.StarStatus; import com.asp.android_app.model.response.TrashStatus; import com.asp.android_app.utils.Result; -import java.util.List; - import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -39,7 +38,7 @@ public MailRepository(Context context) { * @param page current page number * @param resultLiveData a LiveData object to observe result (mail list) */ - public void getMailsByType(String inboxType, int page, MutableLiveData>> resultLiveData) { + public void getMailsByType(String inboxType, int page, MutableLiveData> resultLiveData) { final int MAIL_LIMIT = 50; resultLiveData.postValue(new Result.Loading<>()); mailApi.getMailsByType(inboxType, page, MAIL_LIMIT).enqueue(createCallback(resultLiveData)); @@ -133,7 +132,7 @@ public void markRead(int mailId, ReadStatus status, MutableLiveData * @param query string to search for in mails * @param resultLiveData result live data to observe success or error */ - public void searchMails(String query, MutableLiveData>> resultLiveData) { + public void searchMails(String query, MutableLiveData> resultLiveData) { resultLiveData.postValue(new Result.Loading<>()); mailApi.searchMails(query).enqueue(createCallback(resultLiveData)); } diff --git a/android_app/app/src/main/java/com/asp/android_app/ui/InboxActivity.java b/android_app/app/src/main/java/com/asp/android_app/ui/InboxActivity.java deleted file mode 100644 index 909a25bb..00000000 --- a/android_app/app/src/main/java/com/asp/android_app/ui/InboxActivity.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.asp.android_app.ui; - -import android.os.Bundle; - -import androidx.appcompat.app.AppCompatActivity; - -import com.asp.android_app.R; - -public class InboxActivity extends AppCompatActivity { - - - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_inbox); - } - -} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/LoginFragment.java b/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/LoginFragment.java index 29fc8bb6..07c48fbc 100644 --- a/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/LoginFragment.java +++ b/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/LoginFragment.java @@ -20,7 +20,7 @@ import com.asp.android_app.model.request.LoginRequest; import com.asp.android_app.model.response.AuthResponse; import com.asp.android_app.repository.UserRepository; -import com.asp.android_app.ui.InboxActivity; +import com.asp.android_app.ui.inbox_activity.InboxActivity; import com.asp.android_app.utils.Result; import com.asp.android_app.utils.TokenManager; import com.asp.android_app.viewmodel.UserViewModel; @@ -154,7 +154,9 @@ private void handleLoginSuccess(AuthResponse auth) { TokenManager tokenManager = TokenManager.getInstance(requireContext()); tokenManager.saveToken(auth.getToken()); // navigate to the inbox screen - startActivity(new Intent(getContext(), InboxActivity.class)); + Intent intent = new Intent(getContext(), InboxActivity.class); + intent.putExtra("user", auth.getUser()); + startActivity(intent); requireActivity().finish(); Toast.makeText(getContext(), "Welcome " + auth.getUser().getFullName(), Toast.LENGTH_SHORT).show(); } diff --git a/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/SignupFragment.java b/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/SignupFragment.java index a17efb10..e681d617 100644 --- a/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/SignupFragment.java +++ b/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/SignupFragment.java @@ -31,7 +31,7 @@ import com.asp.android_app.model.User; import com.asp.android_app.model.response.AuthResponse; import com.asp.android_app.repository.UserRepository; -import com.asp.android_app.ui.InboxActivity; +import com.asp.android_app.ui.inbox_activity.InboxActivity; import com.asp.android_app.utils.Base64Converter; import com.asp.android_app.utils.Result; import com.google.android.material.button.MaterialButton; diff --git a/android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/InboxActivity.java b/android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/InboxActivity.java new file mode 100644 index 00000000..6b1dea95 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/InboxActivity.java @@ -0,0 +1,94 @@ +package com.asp.android_app.ui.inbox_activity; + +import static com.asp.android_app.utils.Base64Converter.displayBase64Image; + +import android.os.Bundle; +import android.text.Editable; +import android.text.TextWatcher; +import android.util.Log; +import android.widget.EditText; +import android.widget.ImageView; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; + +import com.asp.android_app.R; +import com.asp.android_app.model.response.UserInfo; + +public class InboxActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_inbox); + // initialize the mail list + if (savedInstanceState == null) { + getSupportFragmentManager() + .beginTransaction() + .replace(R.id.fragment_container, new InboxFragment()) + .commit(); + } + // initialize the profile image + ImageView userImageView = findViewById(R.id.user_avatar); + loadProfileImage(userImageView); + // initialize the drawer menu + DrawerLayout drawerLayout = findViewById(R.id.main); + ImageView hamburgerIcon = findViewById(R.id.hamburger_icon); + hamburgerIcon.setOnClickListener(v -> { + drawerLayout.openDrawer(GravityCompat.START); + }); + + // initialize the search bar + EditText searchInput = findViewById(R.id.search_input); + searchInput.setSelected(false); // on creation - don't show as focused + handleMailSearch(searchInput); + } + + /** + * Loads the user image using base64, if no image found uses the default avatar + * + * @param userImageView image view instance to show on + */ + private void loadProfileImage(ImageView userImageView) { + UserInfo user = getIntent().getParcelableExtra("user"); + if (user != null && user.getImageUrl() != null) { + String imageBase64 = user.getImageUrl(); + displayBase64Image(imageBase64, userImageView); + } else { + userImageView.setImageResource(R.drawable.profile_default); + } + } + + /** + * TODO implement drawer menu functionality + */ + private void handleDrawerMenu() { + Log.i("DRAWER", ""); + } + + /** + * TODO implement search + * + * @param searchInput + */ + private void handleMailSearch(EditText searchInput) { + searchInput.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + // Live filtering logic here + } + + @Override + public void afterTextChanged(Editable editable) { + + } + }); + } + +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/InboxFragment.java b/android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/InboxFragment.java new file mode 100644 index 00000000..9186e103 --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/InboxFragment.java @@ -0,0 +1,83 @@ +package com.asp.android_app.ui.inbox_activity; + +import android.os.Bundle; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Toast; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.ViewModelProvider; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + +import com.asp.android_app.R; +import com.asp.android_app.model.response.MailListResponse; +import com.asp.android_app.utils.Result; +import com.asp.android_app.viewmodel.MailViewModel; + +/** + * Fragment containing the inbox, responsible on the showing the mails list, handling clicks, + * selection and refreshes. + */ +public class InboxFragment extends Fragment { + + private MailViewModel mailViewModel; + private MailAdapter mailAdapter; + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, + @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.inbox_fragment, container, false); + // initialize the recycler view + RecyclerView recyclerView = view.findViewById(R.id.recyclerView); + mailAdapter = new MailAdapter(); + recyclerView.setAdapter(mailAdapter); + recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); + + // initialize the swiping down for refresh + SwipeRefreshLayout swipeRefreshLayout = view.findViewById(R.id.swipeRefreshLayout); + swipeRefreshLayout.setOnRefreshListener(() -> { + // Trigger refresh from ViewModel + mailViewModel.loadMails("incoming"); + }); + + // initialize the mails view model + mailViewModel = new ViewModelProvider(this).get(MailViewModel.class); + observeViewModel(swipeRefreshLayout); + + mailViewModel.loadMails("incoming"); // default inbox is incoming mails + + + return view; + } + + /** + * Observer for mail data changes + */ + private void observeViewModel(SwipeRefreshLayout swipeRefreshLayout) { + mailViewModel.getMailsLiveData().observe(getViewLifecycleOwner(), result -> { + if (result instanceof Result.Success) { + MailListResponse mails = ((Result.Success) result).getData(); + mailAdapter.setMailList(mails.getMails()); + swipeRefreshLayout.setRefreshing(false); + } else if (result instanceof Result.Error) { + swipeRefreshLayout.setRefreshing(false); + String msg = ((Result.Error) result).getMessage(); + // TODO remove logs + Log.i("INBOX ERROR:", msg); + Toast.makeText( + getContext(), + getResources().getString(R.string.err_mails_load) + msg, + Toast.LENGTH_LONG + ).show(); + } + }); + } +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/MailAdapter.java b/android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/MailAdapter.java new file mode 100644 index 00000000..5e62ea5f --- /dev/null +++ b/android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/MailAdapter.java @@ -0,0 +1,126 @@ +package com.asp.android_app.ui.inbox_activity; + +import static com.asp.android_app.utils.Base64Converter.displayBase64Image; + +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.FrameLayout; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.asp.android_app.R; +import com.asp.android_app.model.Mail; +import com.google.android.material.card.MaterialCardView; +import com.google.android.material.imageview.ShapeableImageView; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +/** + * RecyclerView Adapter for displaying a list of Mail items. + */ +public class MailAdapter extends RecyclerView.Adapter { + + private List mailList; + private final Set selectedPositions = new HashSet<>(); + + + public void setMailList(List mailList) { + this.mailList = mailList; + notifyDataSetChanged(); + } + + @NonNull + @Override + public MailViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.mail_item, parent, false); + return new MailViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull MailViewHolder holder, int position) { + // set the data to the fields + Mail mail = mailList.get(position); + holder.subjectText.setText(mail.getSubject()); + holder.senderText.setText(mail.getSender().getFullName()); + holder.previewText.setText(mail.getBody()); + displayBase64Image(mail.getSender().getImageUrl(), holder.imageCheckbox); + + // TODO change style to unread if needed + + // handle the image checkbox - shows V when selected, user's image when not + handleImageCheckbox(holder, position); + + // handle clicks on anything else beside the checkbox + holder.mailCard.setOnClickListener(view -> onContentClick(position)); + } + + /** + * Handles the selection of mail rows by showing a V vector asset instead of a user's image. + * + * @param holder view + * @param position row index + */ + private void handleImageCheckbox(@NonNull MailViewHolder holder, int position) { + Mail mail = mailList.get(position); + boolean isSelected = selectedPositions.contains(position); + + if (isSelected) { + holder.imageCheckbox.setImageResource(R.drawable.ic_checkmark); + holder.imageContainer.setBackgroundResource(R.drawable.circle_selected_background); + // scaling to make it look better + holder.imageCheckbox.setScaleX(0.8f); + holder.imageCheckbox.setScaleY(0.8f); + holder.imageContainer.setScaleX(0.9f); + holder.imageContainer.setScaleY(0.9f); + } else { + displayBase64Image(mail.getSender().getImageUrl(), holder.imageCheckbox); + holder.imageContainer.setBackgroundResource(R.drawable.circle_background); + } + // listen to clicks on the image + holder.imageCheckbox.setOnClickListener(v -> { + if (isSelected) { + selectedPositions.remove(position); + } else { + selectedPositions.add(position); + } + notifyItemChanged(position); + }); + } + + private void onContentClick(int position) { + // TODO implement reading page + Mail m = mailList.get(position); + String msg = + "id: " + m.getId() + ", sender: " + m.getSender().getFullName() + ", subject:" + m.getSubject(); + Log.i("ROW CLICK: ", msg); + } + + @Override + public int getItemCount() { + return mailList != null ? mailList.size() : 0; + } + + static class MailViewHolder extends RecyclerView.ViewHolder { + TextView subjectText, senderText, previewText; + ShapeableImageView imageCheckbox; + FrameLayout imageContainer; + MaterialCardView mailCard; + + public MailViewHolder(@NonNull View itemView) { + super(itemView); + mailCard = itemView.findViewById(R.id.cardMail); + subjectText = itemView.findViewById(R.id.text_subject); + senderText = itemView.findViewById(R.id.text_sender); + previewText = itemView.findViewById(R.id.text_preview); + imageCheckbox = itemView.findViewById(R.id.image_checkbox); + imageContainer = itemView.findViewById(R.id.image_checkbox_container); + } + } +} \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/utils/Base64Converter.java b/android_app/app/src/main/java/com/asp/android_app/utils/Base64Converter.java index a8b9f589..1adcd577 100644 --- a/android_app/app/src/main/java/com/asp/android_app/utils/Base64Converter.java +++ b/android_app/app/src/main/java/com/asp/android_app/utils/Base64Converter.java @@ -65,8 +65,25 @@ public String bitmapToBase64(Bitmap bitmap) { * @param imageView image view to show the image in */ public static void displayBase64Image(String base64String, ImageView imageView) { - byte[] decodedBytes = Base64.decode(base64String, Base64.DEFAULT); - Bitmap decodedBitmap = BitmapFactory.decodeByteArray(decodedBytes, 0, decodedBytes.length); - imageView.setImageBitmap(decodedBitmap); + if (base64String == null || base64String.isEmpty()) return; + + try { + // Strip prefix if it exists (e.g. "data:image/jpeg;base64,...") + if (base64String.contains(",")) { + base64String = base64String.substring(base64String.indexOf(",") + 1); + } + + byte[] decodedBytes = Base64.decode(base64String, Base64.DEFAULT); + Bitmap decodedBitmap = BitmapFactory.decodeByteArray(decodedBytes, 0, decodedBytes.length); + + if (decodedBitmap != null) { + imageView.setImageBitmap(decodedBitmap); + } else { + Log.e("Base64Converter", "Failed to decode Base64 image"); + } + } catch (Exception e) { + Log.e("Base64Converter", "Exception while decoding image: " + e.getMessage()); + } } + } \ No newline at end of file diff --git a/android_app/app/src/main/java/com/asp/android_app/viewmodel/MailViewModel.java b/android_app/app/src/main/java/com/asp/android_app/viewmodel/MailViewModel.java index 78aa3c38..dfde7531 100644 --- a/android_app/app/src/main/java/com/asp/android_app/viewmodel/MailViewModel.java +++ b/android_app/app/src/main/java/com/asp/android_app/viewmodel/MailViewModel.java @@ -9,14 +9,13 @@ import com.asp.android_app.model.Mail; import com.asp.android_app.model.request.SpamRequest; +import com.asp.android_app.model.response.MailListResponse; import com.asp.android_app.model.response.ReadStatus; import com.asp.android_app.model.response.StarStatus; import com.asp.android_app.model.response.TrashStatus; import com.asp.android_app.repository.MailRepository; import com.asp.android_app.utils.Result; -import java.util.List; - /** * ViewModel class for handling mail-related logic and exposing LiveData to the UI. * Acts as a bridge between the Repository and UI layer. @@ -25,7 +24,7 @@ public class MailViewModel extends AndroidViewModel { private final MailRepository mailRepository; - private final MutableLiveData>> mailsListLiveData = new MutableLiveData<>(); + private final MutableLiveData> mailsListLiveData = new MutableLiveData<>(); private final MutableLiveData> mailLiveData = new MutableLiveData<>(); private final MutableLiveData> deleteMailStatus = new MutableLiveData<>(); private final MutableLiveData> restoreMailStatus = new MutableLiveData<>(); @@ -41,7 +40,7 @@ public MailViewModel(@NonNull Application application) { mailRepository = new MailRepository(application.getApplicationContext()); } - public LiveData>> getMailsLiveData() { + public LiveData> getMailsLiveData() { return mailsListLiveData; } diff --git a/android_app/app/src/main/res/drawable/circle_background.xml b/android_app/app/src/main/res/drawable/circle_background.xml new file mode 100644 index 00000000..194d0b34 --- /dev/null +++ b/android_app/app/src/main/res/drawable/circle_background.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/drawable/circle_selected_background.xml b/android_app/app/src/main/res/drawable/circle_selected_background.xml new file mode 100644 index 00000000..f92f1923 --- /dev/null +++ b/android_app/app/src/main/res/drawable/circle_selected_background.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/drawable/ic_checkmark.xml b/android_app/app/src/main/res/drawable/ic_checkmark.xml new file mode 100644 index 00000000..3f965f18 --- /dev/null +++ b/android_app/app/src/main/res/drawable/ic_checkmark.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/drawable/ic_menu.xml b/android_app/app/src/main/res/drawable/ic_menu.xml new file mode 100644 index 00000000..a08084b4 --- /dev/null +++ b/android_app/app/src/main/res/drawable/ic_menu.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/drawable/ic_search.xml b/android_app/app/src/main/res/drawable/ic_search.xml new file mode 100644 index 00000000..e7c165c0 --- /dev/null +++ b/android_app/app/src/main/res/drawable/ic_search.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/layout/activity_inbox.xml b/android_app/app/src/main/res/layout/activity_inbox.xml index 346b53e8..f0ba3000 100644 --- a/android_app/app/src/main/res/layout/activity_inbox.xml +++ b/android_app/app/src/main/res/layout/activity_inbox.xml @@ -5,6 +5,86 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.InboxActivity"> + tools:context=".ui.inbox_activity.InboxActivity"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/layout/inbox_fragment.xml b/android_app/app/src/main/res/layout/inbox_fragment.xml new file mode 100644 index 00000000..fdf4f1e4 --- /dev/null +++ b/android_app/app/src/main/res/layout/inbox_fragment.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/layout/mail_item.xml b/android_app/app/src/main/res/layout/mail_item.xml new file mode 100644 index 00000000..13d63d09 --- /dev/null +++ b/android_app/app/src/main/res/layout/mail_item.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/menu/drawer_menu.xml b/android_app/app/src/main/res/menu/drawer_menu.xml new file mode 100644 index 00000000..36a1cf5c --- /dev/null +++ b/android_app/app/src/main/res/menu/drawer_menu.xml @@ -0,0 +1,32 @@ + +

+ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/values-night/styles.xml b/android_app/app/src/main/res/values-night/styles.xml index 1b02f9ee..2460eaba 100644 --- a/android_app/app/src/main/res/values-night/styles.xml +++ b/android_app/app/src/main/res/values-night/styles.xml @@ -8,5 +8,11 @@ @color/react_light_blue + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/values-night/themes.xml b/android_app/app/src/main/res/values-night/themes.xml index 265a3600..33300838 100644 --- a/android_app/app/src/main/res/values-night/themes.xml +++ b/android_app/app/src/main/res/values-night/themes.xml @@ -1,10 +1,10 @@ - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android_app/app/src/main/res/values/themes.xml b/android_app/app/src/main/res/values/themes.xml index 0fdc1b28..6c4e91ff 100644 --- a/android_app/app/src/main/res/values/themes.xml +++ b/android_app/app/src/main/res/values/themes.xml @@ -4,7 +4,7 @@ @color/react_light_blue @color/react_blue - @color/white + @color/black @color/teal_200 @color/teal_700 @@ -12,6 +12,7 @@ @color/react_light_blue + @color/black @@ -72,7 +72,7 @@ From 17f95dbefe980980ecc8ef544e1824b7cf2bbf68 Mon Sep 17 00:00:00 2001 From: yuval Date: Fri, 1 Aug 2025 19:36:09 +0300 Subject: [PATCH 16/56] GA-129 star checkbox --- .../asp/android_app/ui/ReadingActivity.java | 43 +++++++++++++++++++ .../src/main/res/layout/activity_reading.xml | 21 ++++----- .../app/src/main/res/values/colors.xml | 3 +- .../app/src/main/res/values/strings.xml | 1 + 4 files changed, 57 insertions(+), 11 deletions(-) diff --git a/android_app/app/src/main/java/com/asp/android_app/ui/ReadingActivity.java b/android_app/app/src/main/java/com/asp/android_app/ui/ReadingActivity.java index dd157fed..dbed4647 100644 --- a/android_app/app/src/main/java/com/asp/android_app/ui/ReadingActivity.java +++ b/android_app/app/src/main/java/com/asp/android_app/ui/ReadingActivity.java @@ -3,20 +3,25 @@ import static android.view.View.GONE; import static com.asp.android_app.utils.Base64Converter.displayBase64Image; +import android.content.res.ColorStateList; import android.os.Bundle; import android.util.Log; import android.widget.Button; +import android.widget.CheckBox; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import androidx.core.widget.CompoundButtonCompat; import androidx.lifecycle.ViewModelProvider; import com.asp.android_app.R; import com.asp.android_app.model.Mail; import com.asp.android_app.model.response.Attachment; +import com.asp.android_app.model.response.StarStatus; import com.asp.android_app.model.response.UserInfo; import com.asp.android_app.utils.DateUtil; import com.asp.android_app.utils.Result; @@ -32,6 +37,8 @@ public class ReadingActivity extends AppCompatActivity { // mail contents private TextView mailDate, mailSubject, mailBody, mailAttachments; private LinearLayout attachmentsContainer; + private CheckBox starCheckbox; + private boolean isMailStarred, suppressStarChange = false; @Override protected void onCreate(Bundle savedInstanceState) { @@ -48,6 +55,8 @@ protected void onCreate(Bundle savedInstanceState) { mailBody = findViewById(R.id.mail_body); attachmentsContainer = findViewById(R.id.attachments_container); mailAttachments = findViewById(R.id.tvAttachments); + starCheckbox = findViewById(R.id.starCheckbox); + Button btnReply = findViewById(R.id.btn_reply); Button btnForward = findViewById(R.id.btn_forward); @@ -65,6 +74,23 @@ protected void onCreate(Bundle savedInstanceState) { // initialize reply action buttons btnReply.setOnClickListener(view -> onReplyClick()); btnForward.setOnClickListener(view -> onForwardClick()); + + // initialize the star checkbox + int color = ContextCompat.getColor(this, R.color.star_fill); + CompoundButtonCompat.setButtonTintList(starCheckbox, ColorStateList.valueOf(color)); + starCheckbox.setOnCheckedChangeListener((buttonView, isChecked) -> { + // prevent extra calls when setting manually + if (suppressStarChange) + return; + if (mailId != -1) { + // Disable to prevent mass clicking while waiting for backend response + starCheckbox.setEnabled(false); + StarStatus status = new StarStatus(isChecked); + mailViewModel.toggleStar(mailId, status); + isMailStarred = isChecked; + + } + }); } @@ -75,16 +101,33 @@ protected void onCreate(Bundle savedInstanceState) { * @param viewModel view model that loads the mail */ private void observeMailViewModel(MailViewModel viewModel) { + // mail update viewModel.getMailLiveData().observe(this, result -> { if (result instanceof Result.Success) { Mail mail = ((Result.Success) result).getData(); showSenderInfo(mail.getSender()); showMailContent(mail); + isMailStarred = mail.isStarred(); + suppressStarChange = true; + starCheckbox.setChecked(isMailStarred); + suppressStarChange = false; } else if (result instanceof Result.Error) { Log.i("ERROR READING", ((Result.Error) result).getMessage()); } }); + + // star update + viewModel.getStarStatus().observe(this, result -> { + starCheckbox.setEnabled(true); + if (result instanceof Result.Error) { + Toast.makeText( + this, + getResources().getString(R.string.star_error), + Toast.LENGTH_SHORT + ).show(); + } + }); } /** diff --git a/android_app/app/src/main/res/layout/activity_reading.xml b/android_app/app/src/main/res/layout/activity_reading.xml index c63aed1c..90be6115 100644 --- a/android_app/app/src/main/res/layout/activity_reading.xml +++ b/android_app/app/src/main/res/layout/activity_reading.xml @@ -25,8 +25,8 @@ style="@style/cardMail" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="16dp" - android:layout_gravity="center_horizontal"> + android:layout_gravity="center_horizontal" + android:layout_marginBottom="16dp"> + android:layout_marginHorizontal="8dp" + android:gravity="center_vertical"> @@ -118,11 +117,11 @@ android:id="@+id/mail_body" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginHorizontal="8dp" android:layout_marginBottom="16dp" android:text="Mail content here" android:textSize="16sp" - tools:ignore="HardcodedText" - android:layout_marginHorizontal="8dp" /> + tools:ignore="HardcodedText" /> - + + + @@ -159,9 +160,9 @@ + android:orientation="horizontal">