From 111f821b103e6cc698be0672d524352b4c72c30b Mon Sep 17 00:00:00 2001 From: marinantonio Date: Sat, 31 Jan 2026 01:55:21 +0000 Subject: [PATCH 1/5] Dodan novi logo --- app/build.gradle.kts | 10 ++- app/src/main/ic_launcher-playstore.png | Bin 0 -> 11369 bytes app/src/main/ic_launcher-web.png | Bin 18918 -> 0 bytes .../usecases/GetTimetableDetailDataUseCase.kt | 5 +- .../drawable-v24/ic_launcher_foreground.xml | 58 -------------- .../res/drawable/ic_launcher_foreground.xml | 72 ++++++++++++++++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 27 +------ .../mipmap-anydpi-v26/ic_launcher_round.xml | 27 +------ app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 2525 -> 0 bytes app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1092 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 4275 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2804 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 1898 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 832 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 2771 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1818 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 3460 -> 0 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1538 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 5783 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3956 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 4906 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2154 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 9007 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5878 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 6476 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 2792 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 12886 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 8322 bytes .../res/values/ic_launcher_background.xml | 24 ------ 29 files changed, 83 insertions(+), 140 deletions(-) create mode 100644 app/src/main/ic_launcher-playstore.png delete mode 100644 app/src/main/ic_launcher-web.png delete mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4b7bd61..bda52b7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -30,13 +30,15 @@ android { } release { isMinifyEnabled = true + isShrinkResources = true + proguardFiles( + // Default file with automatically generated optimization rules. + getDefaultProguardFile("proguard-android-optimize.txt") + ) + firebaseCrashlytics { mappingFileUploadEnabled = true } - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) } } compileOptions { diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000000000000000000000000000000000000..1fd2f5a7a9b69de7bf3324ade0c2be6aa7625304 GIT binary patch literal 11369 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 F{THLkDY^gv literal 0 HcmV?d00001 diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png deleted file mode 100644 index abf62ccd7652cb3c06351760bcd40a20ebd1b20f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18918 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 diff --git a/app/src/main/java/com/am/stbus/domain/usecases/GetTimetableDetailDataUseCase.kt b/app/src/main/java/com/am/stbus/domain/usecases/GetTimetableDetailDataUseCase.kt index c5e7ee9..4826b7e 100644 --- a/app/src/main/java/com/am/stbus/domain/usecases/GetTimetableDetailDataUseCase.kt +++ b/app/src/main/java/com/am/stbus/domain/usecases/GetTimetableDetailDataUseCase.kt @@ -33,10 +33,7 @@ class GetTimetableDetailDataUseCase( return try { val timetableId = timetablesRepository.getTimetableId(websiteTitle) - - if (timetableId == null) { - return Result.failure(Exception("Missing timetableId")) - } + ?: return Result.failure(Exception("Missing timetableId")) val doc = timetablesRepository.getTimetableForId(timetableId) diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 0ae43ca..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..00b06be --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 0066bd1..954756a 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,29 +1,6 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 0066bd1..954756a 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,29 +1,6 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 8a144ee3f9b63e767460b84a9bf90b88415f6fb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2525 zcmV<32_p81P)5hx&Ukk|5lgCGwz)lAd&CjEQcqa>-; zC+VmZJN$ksjap7%Ob>@r%1DT|nlaBoP=q}m|9v-ID3`MwGDkg&(y4!qr9xY^FhwL#Q{Zwz_ zSz`oIlWFj1Bn2K0C!2)t##4>TAQaScEB-vjYNVi~4-6GF)sqN+`1Q{qB*-1ufu28DX5D3f{*?3!3OjJZFfY@2ApX`^y`_&W;7xjWz=OJmBP^EpY1SR)aXQHw0W) ztVY)1vOXjJ~5e~u37=OxjN_!0!b2WfbYiA3@(Yu?nLlh|G3V6Su7iP z=|vy7*O$0>1)YC)3)t()o`n>IY}&XAs&2%K9SqvBp_%-|nj&p}a5}YQBzzZw8VVpP&P~HqR;uOTpHbWfZgZ?dIwTWd+etc`XL& zin+67k_iM|&JG6&|0$aNy8__g8-er-UFqTgzkO*F?0VJDB!mWgCe8|ev$7(t%vT%fy7XtGJ)A76P^O_0BzJFIbcqB)xt3itby ztb*i%Ze8QTQ%|l`ysoT6L1eBIuch3~A}Gl0f-0}83;N69AZRR&gSJW@8Mu=yJ%gOc z$9x?8R8`QCV7N^tkcgB>`sZM>ju1~Ht>V$^H;c?56jXCl zL(ow+EvC6V9$FAG9<^8V;L)9A%M?^s9IqzmG!djKr}Y+(rlVRwVYykTAmx(euWz$y zF{*NKz?N3>sm>ZcDajbi5>#I@Q&1}-2gT5G$T-wq#iyiId?>vVX(~Zpi(-&&DB-CI zdgmB>rkrX-K(#Nlpq>UHeDYoxy!ty|^6|=r!+XpxsIim>;m@swwNE@o?-6};W(!kN zm^CPdkK3%!Q9}fgV`+Zm!Y)=v+9X8M^Yr7zAgHN~N3ZC2?$`{4xg6R2r%F=}A3BL3 z9D^)QP;)t-E~&S62a^FfR;8q5Vq|joxVdMUf?6v0bV;Eg+!s>M8bU3~A=C*e+yO1k zkG4EPm^BAc&`qwIoGwOAcbx#b>xC2^ORp}lpy5_A?D&l@9;f)4KuGP|I5BB)CtN1#g%^xYuBeYcDBP zIipfB+>s_wBT^F!$~n)W7pdm@6blYmqqC&cz&j+@^nd4h&-j#DAjOM+QGTvu6 zo2BH;@h}MT_n6UVX7bb8OR8OuoGuAWbP+*ai%?MQO`etwboH%?87puyr@<}L_-HS! zf@aMcx};=sCQwed1SY%16pE@gm!MnMVu2mFntb#s2?=zE#?o20LbWb3@&C5Jya_^s z+?52o!|vDoW@ODBttF)@M`;jKpa&T5{Q(y@WAC2NH0>nN3p zpJKde)m~ELT1!erPER6C^+;$zHP^Yu->WgzYkUT&N}9t4y7m?LoMyyxD=E30DO!$9 z5Q?fPo<|0eCpb0V8|qLJ2BUsXYW9-S%o?q7W*vxCOG+tcx|h(0f+SF05OvOIL6t>u zzm#9_h+9JLhTha` zM_5l@bR%BNhxd4*C}Y7a#PtuJu)}jw2%cF$a04B|ZBPVv`w-l-L2zq=hAc2?NIzo; znGNHNc$~~>?lR!V_XHV$CmFDmkm+6qk~t`6x;F`Ld}$^zdSk2xf6+irPAUp=6Y;z` zE#N({xLm*) z@fgV*EH9kf&>2JqU^zI}&;xTX9wl^%R$h;3;c>m9Fvk7+4Ja?w77?*w1vz*U0#6+Y z*OK$JeG0w3mN$r)Q>b57;=;p5ef)}xtv_WrM%C>v$IGn7!$@87Uuofe7<~v z#b$dtljAzVMuIQFZ;9i}#In}kf2|9~IPdScV6$x;A|l+}*zCtW{QXz{WGRC&$YQZ^ nuvvh{S|(VVwOO0BEs6GjTd*4%W&o$|00000NkvXXu0mjfw-2&+ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..2190c39e4969bd5de779a2a10bc6e451c7e75993 GIT binary patch literal 1092 zcmV-K1iSlENk&FI1ONb6MM6+kP&iC41ONapN5ByfF9$iYZB^A;``|A5CqfQP84`or zmwVH297&R+RP`KM`|kvf@a2gSS~HL%Nm3+v4E#=tlVtVR3pM9f>cF=M35Ln84QagilR|WgxO+a5H$ba*<0`SRj}J( zP(X0RR0SOOE)$^8iScxMPFa{T7$a3lf(QlyVi=AVN|Ge02#6vK$BQJ01c|{BqhJI? zKm?2;U=)~N1uCgusMK)^G9vDvggYC3$Z|GdE*}>%z8AmWYps2!LmK?P?njseh5n~A z+1khFajk!z*FAXo`%aIRv}jD0veA5)_26G}V3e2dZcfB&$5KZNhv z_x1Gk^SkL-A4q+0U1V3))DZada|FPb*d z2X2uy|0{Mm>^$)2xNM)hJlE`VPt5++ix;@vSp|u9bD5~cfh$Xsx_sJVeGQ_nz`#F1_toEZSRm1Rg5 z#*pzxLc5igCVP#V0?8{=T~jFi8(I*-^7WFS8VeM*b3lRdeZ+NtQlj@(QCL}JQgd<5 zCe>MC3fn$zY|{W?O}t~ai389lP*@N1=l`9mE?y$gQ8I<)$Sp9ZS0)BfcnEW2h$aTe z72A5mkWzeQh7NBTC0XcD6WCRbr}AzS7!)j5$&Ds}!9mu7hnfI3m6WT}9+zQWYu@25 zyDG|+XQ4|AW}RBO%*!oNUt*{}f5(OaksOE`xZXRz8k1;Z3`*;RqtKWdLUKR!7S*O7kT#+kL~xncd~=j0cor%#ziM3ae> zB2uJ?lp<0@M2bi$B1MWwDI!H`svi9!+4I`q^m+5~>$mUHr>hTdeRzO(uL>8E9^^6H K>evwfQUL(o7yxVl literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 5dd8e449cd27b1110451ecabe08e992aa49078e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4275 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 V!gBkg?BxIe002ovPDHLkV1nH?9X$X5 diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..e14b8774ec5caeb9f29484359f2c442d2b10c310 GIT binary patch literal 2804 zcmVQH6?mO;3a4G-ZsjZ7HW~I*9RqXs?)GM4_Q2*l0*r=T<P0xC_6+fB0D(DVmmI$dq~(=0Yo7T0zqiPi*dGFQ zA+!4|iinfFE4c1p?ShT0Dn4pZZJ8MN*+k-QVAZmOK8@>6^sa#zja9S!B%#KFrq*Wg zuu(=tocLMAbq}dv_@@{3%_D=NiQH5giiWEYEF}lhO+PTIsxyA*ynJKyvD8qkp5m8; zqYyw!@(CP$RhwNUY;hG~^k#P{YJA>US_)im1_W}=h*U$W*d<0$6&kMwX{=%@H^Gu| zpw^M?!=_zmM~=gtc#Da#>tzc7Q4}JL~DOywY{~WCeW?xv;5}Sup%Z5*9!ZZ3*l(6oE&iL~;pRBYsaD+k zS^I1T6H8roCa!vO<+JNVI1TZy}?iYqkrO2YJ zR670>z{2w&Ab_D}3b!LJmM{E|o)Z9A*C`o}Lrl|P^_-F0K1L5-&(V-`_+6dEGuN>I z0s^Ra9%-cvwU|;(j9+>ar*h68X9e)$iyw2IDPk>XYwMzXGeEtjolfogZ#Q(o7n(w* zf>#c?ZIZqo5cdFJRsvYoNa-a~Ex%aEyG)G~X(%1_ZD5-_mpXCtaYrZWG@8fM$9E6*witD;Ru0H=y+`HWOuAN7%Z z*AF7rl)%LA8m{(l)=B|H+;;@%qdcIB;yyF@lK{?70mWGfV7~ELF+0T?n6L2CFS{-& zz_Hgco7nkH;X|XeeZH*2moKsHox{#g3jh4Q>$;ut!=_dla(TSAOss7*Eq?sg$kZso za_QF-z@=EYp2wmJm1Lp+c7toi0qQlCQ${W~YY#W>%}HJbDtAtm>hVi@Cep6JY&l#_ z@5B_V9i5zUK3R zl5w6bHoHne*_dE5nYD+A`%D1eao8|VsDm32z`7sqBP)bbjZp<$!)Qk`V7n%N_(?I3 z_I%;zHBR8tXFvPd)g^(5u_%ARx_iU+XDosx>jdZ-AD1QT?6r>8Rh3ij$7jXRl(A6lG`h-J^wMLUhO2j#-rcIgXpE*Pa8I(534NG6lXZ%j>d zZpZlr8%ock-@dFdw)n5v_iCR2Q_eXCTNba*e*X~9MfS#4<>5W;nD=GE-t?0XWFc2% zSxuznZ)L;QwC5f3?rG^jI<^)s62W49~ z)xBQwT>=CVAgnVWx-%gDQ)9Hff(hDA@eywSsm_47d2jcC@4n<-Q@u0}=8q4Lmp5=+NOvFS%83ygD85O7krkhlowYC!}9J3NxC8v89`keZ7C-`Su@A GfWZKDZG{&A literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index b3cd7a5131b79f0ff5839b186302ee285f4e5f79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1898 zcmV-w2bK7VP)IuRK`CG|jhWlB%|EudKW4UUnVQW+d=Z(? zWg6p_=oEF+2>3!oK;Ca?0YO0IB~o2tRDPbFb6aTvDb-ei#3tXAq`ma}IrrRi&%M7f zW8S|;@C!g`4ItzXuawqrVEktuY2*a*HT)QU5gx6Z2wh4yco6S8ETZ2=53llO)I79E z#zR;9{udA9Te;4-2g50yhyCPfNQjpo_H@J@eDNS2aNvkhcSH0Mv}QFZz{|z*sAY|F zPe*J!4eIHPd&+gjb3GlyBlg?qfr9y{F{UFUMdV`WwI6_xPw$mEV$bL8%7+Yq{gdI1 zJbBOpD7w#`2%2Z;^_2iOFNVy1-X7OA6u|TLSZFAbKz*^;Y_+N6CIS3)c$t@p0LEwF zSz9b@|8XJA{?GwDXX)kdGZ7RLH=~kAy1@dk5BiK-G~W@j(^d@$aQwhhZ;Jp_=0w1F zfi=)DLq&;a;9^r6RdYo&_%56{U~Ev}BxqO5-wnXgq{RaakYo|=&`}d*R1GCE@LAwA zV5|TGl71l=9@a;{9RMt?@LzKb)81cw*^k=rd0=a+m$TD2Ob;ic@}BDi6C7;&jI-uh zftA%5NIkO>@~?&BOeri6P+K5|rHdy)fUh%r_q8_z*tyLQ(vpMCQtBBYNW!KwfRld& z!KSa~!j{bopruM?S%50cdzYyKjPh9ccB2;qxc+a5*=6!M&g_>PW;1}_5(2>9jt}mx zc5wNu5HxocqYGgF&czI11_Gpz2(BVK0!lJP-M=S}aDc;m z0};T60bDsJWNQG;bF^_5q>H)_Bz*Md09|*YVgIfG*!IIB*#48xTLCz6Xc^3(=Lo?o zrofGhA!t6Fc73k;b|e(vFcW~(R4#{{DlfUJOs!LGasO_Oa@oZu7Vv~{1`yW>0o%=6l0cXv-)hE2Ls5t z914FQ3xbSGtDu^hj{sF(Bv*r7K?gGQH2t&u22GH*$9w0 z!U6ISKt)m4nWxCt6-l`IVhL2_i~@lCYhj?Ks2AwW7mDFdv4m?Vk zphjoBt_aPON~GM~QYkHJ%L91Nbp)}-H3zF*LyO6BJ4iNJQ=4OkGrUb zGAY+oE~9l}Ie;V`K*ClZpjOvVCy%Z$3Xpp>w9ofxANb^B?LJVP5w161D#3jR-^*lN zbA=3Q@+6i6IJ8H5sCRN4htu!SN0XfeM)KSWrn%T*v*yr8_VzZo7x1wA3^y<@g(gzD zjJsDU$3<;HfLyE=WX6(WVE0Kx$VhmG zvr*-XIcj}tsQsl55}PnwcpUXI)DF;&O5eN7B;y*fJT_s4p(@ji3-w+Vt2P{^3`MDbXOYM2*Ixl(@Q7&~PX8&oLWiz+AP{;tCVEzI52J{tG1`*e zXg5$*!Tj!DS#*oDH%)YrW`%(+fIDkZb*w&$=q;j+g7d2C*NICcQ57R zz0d)JS}dmpV$0k@jhp~L07CEsG9UmUh(OJB6;U(_qDjysKm>!LsfvOKm)`mfgiq?{oFQi(}IPc#0v_vL=wCz;extVT6=AGTGRc9*FL zh{=386i5Qo!E`Y@ibJ9vAF|49SQNSDYt?G!NAP@mj6o{h0dWHGd z^`k|g$^?8h#fl1*MpOO*=XTmU9%Jb#9OHlc-#?qYUS~h!YwvWt-re%?3eN%D{M}w| zd(V&W{V|JvfB(Vk>t}Pje+e%4XV+$kSbD4{P;cq zjz1?9srGAZP>WL*re>7M{=wnV5nw?^{e5L-%dD919UMV$-Ke`EW=-Ae)5rw|sgd(s zosFgh4!>ytEm4g+fG$OM>eg-Z3CP{Ud;^G*&z5+Tx>w2BWC9AVLfpf!7x8TXP;4{eC5EerMl{G7 za=g=0mC2A%wR6|W>LfrZkz+z2u?EEpD|!gfo<=;=5dhl`yI8sA>{8EmCYM8P2!X9$ zR(?-Vy>y#AzaUIkc2<5F!<)RU>}D=~41oGr-37G=y&5@ZYDT&Fdu(`A2NpE`X;oR? zBIc}Lc8?np*pOWdHgk$8%ZV|4IP7T9ecO literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 6b627726d0de542302c8fae21bade32b824a5a5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2771 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 Z{y*7G>F?ul+wK4W002ovPDHLkV1g|jPY3`2 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..db7d8fab306ec23eb1716bbfa3a4922017652971 GIT binary patch literal 1818 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

0jVp`#)Se2IPrpQ?wqTidmWPp%V7;8Kt3z( z?d!%)KnKH>Qyo99CDS?~_dU>#mQ8?Ie1y)?FQ2$L7V+2X~IjI*|M1B6QG^P>JA3Hj9o4dWNVCDVo{yf93Q!=)w}Ezhl~McX5Q?n2{7Nm&N^AZ%}Dz_Z#)jzT$P>gb%YEk%4W$4 zZyLO639#P%iGTjel7NDVtaM59*kJoB^UZVq@qeZaxO3!A{5Jv|_SUgK$4#a~ZB6nA zz*-_M-c-q<2iudRmQI%K@}&GF!0~VYb3y6Yyf~7bVi3Na_tlX}<0jJ~E}PY6Sy^}G zzv6wWwTf?)LyqaQN;>(<-Bx1iAbh)>;=?geoJ}}Cwp9cePn~bKy?1o-D@z0gEhYc& zOUicB$!SyL$MgN~n~*67EOP_`ObBqK%+)_$H=iIQgXkqt*sBP`Md&72cbKlGG3M=g><)p0&?hN?CHh1p*h29Qg zib|jNjtm1ev)I6y@}imzmnH;Q{c{2L$Oxt5~4v*y-vWXxm#yXWryVKOJZ6 z(#pqm&bSbvZsw-vp9OdN)8W&!iU9j@1_2(6zpo~&;nlfr^Q+{{4lC=$9!}i9eOE;G zupL}6Vylfc+uvGeJRNU*@Q9-}zId<`p1p^P`?sUYe7?o2*rkRQkQy8RcXJ9 z${!S-pz|pwbQx$Ob0@r4pU%_cUh<`x^Q?SaVPRq6<9__5ex3W=YeJWSrZVQbvDkzY OPB>vK=DLi5Y5@SxY^w?Y literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 78c2aed3fa8aa4f5da2057e8579be809433cc42f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4906 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 M6Df;YcDuH71vySmo&W#< literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 16dfc9c5fe16dc9fc8e4b0b21593fa89fbe7771d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6476 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index cc4775d00942f26aeabb1dfbc3da0dbfdff8f92a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12886 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 YV@02}ZdT78{}%z23n%m4rY diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..533b9cbbb784a5b1d257a0577740f77348c2f43a GIT binary patch literal 8322 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£Uh*kWxd0Yg;Y0mm}z%+Om~_K=U!e$Jq}zW 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 MrG|y9N6DB30F!$Q9{>OV literal 0 HcmV?d00001 diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml index e798b8e..da3d16d 100644 --- a/app/src/main/res/values/ic_launcher_background.xml +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -1,28 +1,4 @@ - - #FFEE58 \ No newline at end of file From b75b03bccfc532816f358bc068855e64b4f72376 Mon Sep 17 00:00:00 2001 From: marinantonio Date: Sun, 29 Mar 2026 14:36:40 +0100 Subject: [PATCH 2/5] Dosta promjena, gmaps, room db za spremanje voznih redova, nova ikonica, noviji dizajn --- .github/workflows/build.yml | 3 +- .github/workflows/upload.yml | 3 +- app/build.gradle.kts | 6 + app/google-services.json | 64 +---- app/src/main/AndroidManifest.xml | 9 +- .../java/com/am/stbus/common/Constants.kt | 6 +- .../java/com/am/stbus/common/di/AppModule.kt | 30 +- .../com/am/stbus/common/di/NetworkModule.kt | 15 + .../am/stbus/common/di/RepositoryModule.kt | 4 +- .../com/am/stbus/common/di/UseCaseModule.kt | 29 +- .../com/am/stbus/common/di/ViewModelModule.kt | 16 +- .../com/am/stbus/common/room/AppDatabase.kt | 11 +- .../com/am/stbus/common/room/Converters.kt | 58 ++++ .../main/java/com/am/stbus/data/ApiService.kt | 16 -- .../com/am/stbus/data/models/LiveVehicle.kt | 48 ++++ .../data/models/{ => roomdb}/FavouriteItem.kt | 4 +- .../roomdb/TimetableDetailDataCached.kt | 38 +++ .../models/timetables/TimetableDetailData.kt | 38 +++ .../com/am/stbus/data/services/ApiService.kt | 43 +++ .../{ => services}/room/FavouriteItemDao.kt | 6 +- .../room/TimetableDetailDataCachedDao.kt | 41 +++ .../{ => services}/static/BusLinesData.kt | 2 +- .../{ => services}/static/BusStopsData.kt | 2 +- .../repositories/PrometApiRepository.kt | 11 +- .../repositories/TimetablesRepository.kt | 118 +++++++- .../usecases/FavouritesRoomDbUseCase.kt | 4 +- .../usecases/GetTimetableDetailDataUseCase.kt | 95 ------- .../gmaps/GetLiveVehiclesFromHubConnection.kt | 69 +++++ .../usecases/gmaps/GetLiveVehiclesUseCase.kt | 47 ++++ .../GetLocalTimetableDetailDataUseCase.kt | 59 ++++ .../GetRemoteTimetableDetailDataUseCase.kt | 46 +++ .../com/am/stbus/presentation/MainActivity.kt | 133 +++++++-- .../am/stbus/presentation/MainViewModel.kt | 4 +- .../screens/common/AppBarScreen.kt | 15 +- .../screens/common/LoadingScreen.kt | 2 - .../presentation/screens/home/HomeScreen.kt | 8 +- .../presentation/screens/info/InfoScreen.kt | 117 ++++++++ .../screens/info/InfoScreenViewModel.kt | 33 +++ .../screens/info/maps/GmapsScreen.kt | 210 ++++++++++++++ .../screens/info/maps/GmapsScreenViewModel.kt | 125 +++++++++ .../screens/info/maps/MapMarker.kt | 105 +++++++ .../screens/info/prometweb/PrometWebScreen.kt | 69 +++++ ...ListScreen.kt => BusStopArrivalsScreen.kt} | 4 +- .../detail/BusStopArrivalsDetailScreen.kt | 8 +- .../timetables/{list => }/TimetablesScreen.kt | 14 +- .../detail/TimetablesDetailScreen.kt | 119 +++++--- .../detail/TimetablesDetailViewModel.kt | 55 +++- .../com/am/stbus/presentation/theme/Color.kt | 261 ++++++++++++++++-- .../com/am/stbus/presentation/theme/Theme.kt | 114 +++++--- .../com/am/stbus/presentation/theme/Type.kt | 77 ++++-- app/src/main/res/values/font_certs.xml | 40 +++ build.gradle.kts | 1 + gradle/libs.versions.toml | 11 +- settings.gradle | 3 + 54 files changed, 2068 insertions(+), 401 deletions(-) create mode 100644 app/src/main/java/com/am/stbus/common/room/Converters.kt delete mode 100644 app/src/main/java/com/am/stbus/data/ApiService.kt create mode 100644 app/src/main/java/com/am/stbus/data/models/LiveVehicle.kt rename app/src/main/java/com/am/stbus/data/models/{ => roomdb}/FavouriteItem.kt (94%) create mode 100644 app/src/main/java/com/am/stbus/data/models/roomdb/TimetableDetailDataCached.kt create mode 100644 app/src/main/java/com/am/stbus/data/models/timetables/TimetableDetailData.kt create mode 100644 app/src/main/java/com/am/stbus/data/services/ApiService.kt rename app/src/main/java/com/am/stbus/data/{ => services}/room/FavouriteItemDao.kt (91%) create mode 100644 app/src/main/java/com/am/stbus/data/services/room/TimetableDetailDataCachedDao.kt rename app/src/main/java/com/am/stbus/data/{ => services}/static/BusLinesData.kt (99%) rename app/src/main/java/com/am/stbus/data/{ => services}/static/BusStopsData.kt (97%) delete mode 100644 app/src/main/java/com/am/stbus/domain/usecases/GetTimetableDetailDataUseCase.kt create mode 100644 app/src/main/java/com/am/stbus/domain/usecases/gmaps/GetLiveVehiclesFromHubConnection.kt create mode 100644 app/src/main/java/com/am/stbus/domain/usecases/gmaps/GetLiveVehiclesUseCase.kt create mode 100644 app/src/main/java/com/am/stbus/domain/usecases/timetables/GetLocalTimetableDetailDataUseCase.kt create mode 100644 app/src/main/java/com/am/stbus/domain/usecases/timetables/GetRemoteTimetableDetailDataUseCase.kt create mode 100644 app/src/main/java/com/am/stbus/presentation/screens/info/InfoScreen.kt create mode 100644 app/src/main/java/com/am/stbus/presentation/screens/info/InfoScreenViewModel.kt create mode 100644 app/src/main/java/com/am/stbus/presentation/screens/info/maps/GmapsScreen.kt create mode 100644 app/src/main/java/com/am/stbus/presentation/screens/info/maps/GmapsScreenViewModel.kt create mode 100644 app/src/main/java/com/am/stbus/presentation/screens/info/maps/MapMarker.kt create mode 100644 app/src/main/java/com/am/stbus/presentation/screens/info/prometweb/PrometWebScreen.kt rename app/src/main/java/com/am/stbus/presentation/screens/stops/{list/BusStopArrivalsListScreen.kt => BusStopArrivalsScreen.kt} (96%) rename app/src/main/java/com/am/stbus/presentation/screens/timetables/{list => }/TimetablesScreen.kt (92%) create mode 100644 app/src/main/res/values/font_certs.xml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4c5c90..14fe38f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,7 +38,8 @@ jobs: id: updateSecrets run: | echo "Updating Secrets.kt" - echo '${{ secrets.SECRETS }}' > app/src/main/java/com/am/stbus/common/Secrets.kt + echo '${{ secrets.SECRETS }}' > app/src/main/java/com/am/stbus/common/Secrets.kt + echo '${{ secrets.GRADLE_LOCAL_PROPERTIES }}' > local.properties - name: Build with Gradle run: ./gradlew buildRelease diff --git a/.github/workflows/upload.yml b/.github/workflows/upload.yml index 13294a8..8865dd8 100644 --- a/.github/workflows/upload.yml +++ b/.github/workflows/upload.yml @@ -38,7 +38,8 @@ jobs: id: updateSecrets run: | echo "Updating Secrets.kt" - echo '${{ secrets.SECRETS }}' > app/src/main/java/com/am/stbus/common/Secrets.kt + echo '${{ secrets.SECRETS }}' > app/src/main/java/com/am/stbus/common/Secrets.kt + echo '${{ secrets.GRADLE_LOCAL_PROPERTIES }}' > local.properties - name: Build Release AAB id: buildRelease diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bda52b7..59de1ee 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -6,6 +6,7 @@ plugins { alias(libs.plugins.ksp) alias(libs.plugins.google.services) alias(libs.plugins.crashlytics) + alias(libs.plugins.google.maps.secrets) } android { @@ -55,11 +56,13 @@ android { } dependencies { + implementation("com.google.code.gson:gson:2.13.2") implementation(libs.androidx.core.ktx) implementation(libs.androidx.lifecycle.runtime.ktx) implementation(libs.androidx.activity.compose) implementation(platform(libs.androidx.compose.bom)) implementation(libs.androidx.ui) + implementation(libs.androidx.ui.fonts) implementation(libs.androidx.ui.graphics) implementation(libs.androidx.ui.tooling.preview) implementation(libs.androidx.material3) @@ -77,6 +80,9 @@ dependencies { implementation(libs.firebase.crashlytics) implementation(libs.firebase.analytics) + implementation(libs.maps.compose) + implementation(libs.microsoft.signal) + implementation(platform(libs.koin.bom)) implementation(libs.koin.android) implementation(libs.koin.compose) diff --git a/app/google-services.json b/app/google-services.json index abf62a2..c30e7ed 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -1,88 +1,52 @@ { "project_info": { - "project_number": "123", - "firebase_url": "https://android-app.firebaseio.com", - "project_id": "android-app", - "storage_bucket": "test.com," + "project_number": "1026289851354", + "firebase_url": "https://split-bus-android-app.firebaseio.com", + "project_id": "split-bus-android-app", + "storage_bucket": "split-bus-android-app.firebasestorage.app" }, "client": [ { "client_info": { - "mobilesdk_app_id": "123", + "mobilesdk_app_id": "1:1026289851354:android:3725c1d82b0bec13bc3ee3", "android_client_info": { "package_name": "com.am.stbus" } }, - "oauth_client": [ - { - "client_id": "123", - "client_type": 1, - "android_info": { - "package_name": "com.am.stbus", - "certificate_hash": "456" - } - }, - { - "client_id": "123.apps.googleusercontent.com", - "client_type": 3 - } - ], + "oauth_client": [], "api_key": [ { - "current_key": "456" + "current_key": "AIzaSyDu7x2JHOZ756IutTVnRneU-fq45YK9tJA" }, { - "current_key": "789" + "current_key": "AIzaSyCZKjrAHwHhAPBXfvJujbuBFFxGHVt18Ro" } ], "services": { "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "123.apps.googleusercontent.com", - "client_type": 3 - } - ] + "other_platform_oauth_client": [] } } }, { "client_info": { - "mobilesdk_app_id": "123", + "mobilesdk_app_id": "1:1026289851354:android:affb866b44ecbb85bc3ee3", "android_client_info": { "package_name": "com.am.stbus.dev" } }, - "oauth_client": [ - { - "client_id": "123.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.am.stbus.dev", - "certificate_hash": "345" - } - }, - { - "client_id": "123.apps.googleusercontent.com", - "client_type": 3 - } - ], + "oauth_client": [], "api_key": [ { - "current_key": "456" + "current_key": "AIzaSyDu7x2JHOZ756IutTVnRneU-fq45YK9tJA" }, { - "current_key": "789" + "current_key": "AIzaSyCZKjrAHwHhAPBXfvJujbuBFFxGHVt18Ro" } ], "services": { "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "12345.apps.googleusercontent.com", - "client_type": 3 - } - ] + "other_platform_oauth_client": [] } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3ecf819..caed757 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,14 +46,13 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.SplitBus" - android:usesCleartextTraffic="true" - tools:ignore="GoogleAppIndexingWarning" - tools:targetApi="m"> + tools:ignore="GoogleAppIndexingWarning"> - + + + + @array/com_google_android_gms_fonts_certs_dev + @array/com_google_android_gms_fonts_certs_prod + + + + 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 + + + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 74aa0af..898cf71 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,4 +6,5 @@ plugins { alias(libs.plugins.ksp) apply false alias(libs.plugins.google.services) apply false alias(libs.plugins.crashlytics) apply false + alias(libs.plugins.google.maps.secrets) apply false } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6f286f1..d4d8b9f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,6 +4,7 @@ kotlin = "2.2.20" ksp = "2.2.20-2.0.4" googleServices = "4.4.4" crashlytics = "3.0.6" +secrets = "2.0.1" coreKtx = "1.17.0" junit = "4.13.2" @@ -29,6 +30,9 @@ room = "2.8.3" firebaseBom = "34.6.0" +composeMaps = "6.12.0" +microsoftSignal = "10.0.0" + koinBom = "4.1.1" retrofit = "3.0.0" navigationFragmentKtx = "2.9.4" @@ -45,12 +49,14 @@ androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecyc androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } androidx-compose-bom = { group = "androidx.compose", name = "compose-bom-alpha", version.ref = "composeBom" } androidx-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-ui-fonts = { group = "androidx.compose.ui", name = "ui-text-google-fonts" } androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } + kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" } kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" } @@ -83,6 +89,9 @@ firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.r firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics" } firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics" } +maps-compose = { group = "com.google.maps.android", name = "maps-compose", version.ref = "composeMaps" } +microsoft-signal = { group = "com.microsoft.signalr", name = "signalr", version.ref = "microsoftSignal" } + koin-bom = { group = "io.insert-koin", name = "koin-bom", version.ref = "koinBom" } koin-android = { module = "io.insert-koin:koin-android" } koin-compose = { module = "io.insert-koin:koin-androidx-compose" } @@ -107,4 +116,4 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } jetbrains-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinSerialization"} google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" } crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "crashlytics" } - +google-maps-secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets" } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 6d31a2f..2579d77 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,6 +11,9 @@ pluginManagement { gradlePluginPortal() } } +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' +} dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { From 1ab8fb95c75ec8c8a2c279b2ac94ba97a52f7443 Mon Sep 17 00:00:00 2001 From: marinantonio Date: Sun, 29 Mar 2026 14:52:01 +0100 Subject: [PATCH 3/5] Dosta promjena, gmaps, room db za spremanje voznih redova, nova ikonica, noviji dizajn --- app/proguard-rules.pro | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 52134ab..0576d1f 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -30,4 +30,7 @@ -keep class **.R$* -keepattributes SourceFile,LineNumberTable # Keep file names and line numbers. --keep public class * extends java.lang.Exception # Optional: Keep custom exceptions. \ No newline at end of file +-keep public class * extends java.lang.Exception # Optional: Keep custom exceptions. + +# SLF4J rules +-dontwarn org.slf4j.** From bac9a9411e9f7ebe60cd2c886e744b5a692e6b59 Mon Sep 17 00:00:00 2001 From: marinantonio Date: Sun, 29 Mar 2026 14:56:11 +0100 Subject: [PATCH 4/5] Verzija 4.1.0 --- app/build.gradle.kts | 6 +++--- gradle/libs.versions.toml | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 59de1ee..2c27f60 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -17,8 +17,8 @@ android { applicationId = "com.am.stbus" minSdk = 23 targetSdk = 36 - versionCode = 84 - versionName = "4.0.3" + versionCode = 85 + versionName = "4.1.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -56,7 +56,7 @@ android { } dependencies { - implementation("com.google.code.gson:gson:2.13.2") + implementation(libs.gson) implementation(libs.androidx.core.ktx) implementation(libs.androidx.lifecycle.runtime.ktx) implementation(libs.androidx.activity.compose) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d4d8b9f..98eb6d9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,6 @@ [versions] agp = "8.13.0" +gson = "2.13.2" kotlin = "2.2.20" ksp = "2.2.20-2.0.4" googleServices = "4.4.4" @@ -42,6 +43,7 @@ jsoup = "1.21.2" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +gson = { module = "com.google.code.gson:gson", version.ref = "gson" } junit = { group = "junit", name = "junit", version.ref = "junit" } androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } From 415119b2006b0c355cf9a7b7bf5098b9f02826a4 Mon Sep 17 00:00:00 2001 From: marinantonio Date: Sun, 29 Mar 2026 15:11:42 +0100 Subject: [PATCH 5/5] Verzija 4.1.0 --- app/build.gradle.kts | 11 ++-- app/google-services.json | 64 +++++++++++++++---- app/proguard-rules.pro | 3 +- .../detail/TimetablesDetailScreen.kt | 13 +++- settings.gradle | 4 +- 5 files changed, 71 insertions(+), 24 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2c27f60..2d320d9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -34,7 +34,8 @@ android { isShrinkResources = true proguardFiles( // Default file with automatically generated optimization rules. - getDefaultProguardFile("proguard-android-optimize.txt") + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" ) firebaseCrashlytics { @@ -46,8 +47,10 @@ android { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" + kotlin { + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) + } } buildFeatures { buildConfig = true @@ -121,4 +124,4 @@ dependencies { debugImplementation(libs.androidx.ui.tooling) debugImplementation(libs.androidx.ui.test.manifest) testImplementation(kotlin("test")) -} \ No newline at end of file +} diff --git a/app/google-services.json b/app/google-services.json index c30e7ed..abf62a2 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -1,52 +1,88 @@ { "project_info": { - "project_number": "1026289851354", - "firebase_url": "https://split-bus-android-app.firebaseio.com", - "project_id": "split-bus-android-app", - "storage_bucket": "split-bus-android-app.firebasestorage.app" + "project_number": "123", + "firebase_url": "https://android-app.firebaseio.com", + "project_id": "android-app", + "storage_bucket": "test.com," }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:1026289851354:android:3725c1d82b0bec13bc3ee3", + "mobilesdk_app_id": "123", "android_client_info": { "package_name": "com.am.stbus" } }, - "oauth_client": [], + "oauth_client": [ + { + "client_id": "123", + "client_type": 1, + "android_info": { + "package_name": "com.am.stbus", + "certificate_hash": "456" + } + }, + { + "client_id": "123.apps.googleusercontent.com", + "client_type": 3 + } + ], "api_key": [ { - "current_key": "AIzaSyDu7x2JHOZ756IutTVnRneU-fq45YK9tJA" + "current_key": "456" }, { - "current_key": "AIzaSyCZKjrAHwHhAPBXfvJujbuBFFxGHVt18Ro" + "current_key": "789" } ], "services": { "appinvite_service": { - "other_platform_oauth_client": [] + "other_platform_oauth_client": [ + { + "client_id": "123.apps.googleusercontent.com", + "client_type": 3 + } + ] } } }, { "client_info": { - "mobilesdk_app_id": "1:1026289851354:android:affb866b44ecbb85bc3ee3", + "mobilesdk_app_id": "123", "android_client_info": { "package_name": "com.am.stbus.dev" } }, - "oauth_client": [], + "oauth_client": [ + { + "client_id": "123.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.am.stbus.dev", + "certificate_hash": "345" + } + }, + { + "client_id": "123.apps.googleusercontent.com", + "client_type": 3 + } + ], "api_key": [ { - "current_key": "AIzaSyDu7x2JHOZ756IutTVnRneU-fq45YK9tJA" + "current_key": "456" }, { - "current_key": "AIzaSyCZKjrAHwHhAPBXfvJujbuBFFxGHVt18Ro" + "current_key": "789" } ], "services": { "appinvite_service": { - "other_platform_oauth_client": [] + "other_platform_oauth_client": [ + { + "client_id": "12345.apps.googleusercontent.com", + "client_type": 3 + } + ] } } } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 0576d1f..c162694 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -32,5 +32,4 @@ -keepattributes SourceFile,LineNumberTable # Keep file names and line numbers. -keep public class * extends java.lang.Exception # Optional: Keep custom exceptions. -# SLF4J rules --dontwarn org.slf4j.** +-dontwarn org.slf4j.impl.StaticLoggerBinder \ No newline at end of file diff --git a/app/src/main/java/com/am/stbus/presentation/screens/timetables/detail/TimetablesDetailScreen.kt b/app/src/main/java/com/am/stbus/presentation/screens/timetables/detail/TimetablesDetailScreen.kt index 09d9b21..36ea8eb 100644 --- a/app/src/main/java/com/am/stbus/presentation/screens/timetables/detail/TimetablesDetailScreen.kt +++ b/app/src/main/java/com/am/stbus/presentation/screens/timetables/detail/TimetablesDetailScreen.kt @@ -62,6 +62,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp +import com.am.stbus.R import com.am.stbus.data.models.BusLine import com.am.stbus.presentation.screens.common.AppBarScreen import com.am.stbus.presentation.screens.common.ErrorScreen @@ -149,7 +150,7 @@ fun TimetablesDetailScreen( }, text = { Text( - text = day.toString() + text = day.toStringLocalised() ) } ) @@ -234,6 +235,16 @@ fun TimetablesDetailScreen( sealed class TimetableDetailScreenDay { + + @Composable + fun toStringLocalised(): String { + return when (this) { + is Workday -> stringResource(id = R.string.timetable_detail_work_day) + is Saturday -> stringResource(id = R.string.timetable_detail_saturday) + is Sunday -> stringResource(id = R.string.timetable_detail_sunday) + } + } + data object Workday : TimetableDetailScreenDay() data object Saturday : TimetableDetailScreenDay() data object Sunday : TimetableDetailScreenDay() diff --git a/settings.gradle b/settings.gradle index 2579d77..c9a9a6e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,9 +11,7 @@ pluginManagement { gradlePluginPortal() } } -plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' -} + dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories {