From df5f24ef16c0f9be068d3dca2739d15a2888125f Mon Sep 17 00:00:00 2001 From: Joshua Burman Date: Sun, 24 Nov 2024 15:21:14 -0500 Subject: [PATCH 01/13] update to run modern version --- android/app/build.gradle | 2 +- android/build.gradle | 2 +- sendtrain/.gitignore | 1 + sendtrain/build.gradle.kts | 40 +++++ sendtrain/proguard-rules.pro | 21 +++ .../sendtrain/ExampleInstrumentedTest.java | 25 +++ sendtrain/src/main/AndroidManifest.xml | 12 ++ .../res/drawable/ic_launcher_background.xml | 170 ++++++++++++++++++ .../res/drawable/ic_launcher_foreground.xml | 30 ++++ .../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 .../src/main/res/values-night/themes.xml | 10 ++ sendtrain/src/main/res/values/colors.xml | 10 ++ sendtrain/src/main/res/values/strings.xml | 3 + sendtrain/src/main/res/values/themes.xml | 10 ++ .../sendtrain/sendtrain/ExampleUnitTest.java | 17 ++ 26 files changed, 363 insertions(+), 2 deletions(-) create mode 100644 sendtrain/.gitignore create mode 100644 sendtrain/build.gradle.kts create mode 100644 sendtrain/proguard-rules.pro create mode 100644 sendtrain/src/androidTest/java/com/sendtrain/sendtrain/ExampleInstrumentedTest.java create mode 100644 sendtrain/src/main/AndroidManifest.xml create mode 100644 sendtrain/src/main/res/drawable/ic_launcher_background.xml create mode 100644 sendtrain/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 sendtrain/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 sendtrain/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 sendtrain/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 sendtrain/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 sendtrain/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 sendtrain/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 sendtrain/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 sendtrain/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 sendtrain/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 sendtrain/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 sendtrain/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 sendtrain/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 sendtrain/src/main/res/values-night/themes.xml create mode 100644 sendtrain/src/main/res/values/colors.xml create mode 100644 sendtrain/src/main/res/values/strings.xml create mode 100644 sendtrain/src/main/res/values/themes.xml create mode 100644 sendtrain/src/test/java/com/sendtrain/sendtrain/ExampleUnitTest.java diff --git a/android/app/build.gradle b/android/app/build.gradle index f50e669..fead8d1 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -47,7 +47,7 @@ android { applicationId "com.sendtrain.sendtrain" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. - minSdkVersion 17 + minSdkVersion flutter.minSdkVersion targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/android/build.gradle b/android/build.gradle index 58a8c74..713d7f6 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -26,6 +26,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/sendtrain/.gitignore b/sendtrain/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/sendtrain/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/sendtrain/build.gradle.kts b/sendtrain/build.gradle.kts new file mode 100644 index 0000000..0c3f9c2 --- /dev/null +++ b/sendtrain/build.gradle.kts @@ -0,0 +1,40 @@ +plugins { + id("com.android.application") +} + +android { + namespace = "com.sendtrain.sendtrain" + compileSdk = 34 + + defaultConfig { + applicationId = "com.sendtrain.sendtrain" + minSdk = 24 + targetSdk = 34 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } +} + +dependencies { + + implementation("com.android.support:appcompat-v7:28.0.0") + testImplementation("junit:junit:4.13.2") + androidTestImplementation("com.android.support.test:runner:1.0.2") + androidTestImplementation("com.android.support.test.espresso:espresso-core:3.0.2") +} \ No newline at end of file diff --git a/sendtrain/proguard-rules.pro b/sendtrain/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/sendtrain/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/sendtrain/src/androidTest/java/com/sendtrain/sendtrain/ExampleInstrumentedTest.java b/sendtrain/src/androidTest/java/com/sendtrain/sendtrain/ExampleInstrumentedTest.java new file mode 100644 index 0000000..e87b4d0 --- /dev/null +++ b/sendtrain/src/androidTest/java/com/sendtrain/sendtrain/ExampleInstrumentedTest.java @@ -0,0 +1,25 @@ +package com.sendtrain.sendtrain; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.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.sendtrain.sendtrain", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/sendtrain/src/main/AndroidManifest.xml b/sendtrain/src/main/AndroidManifest.xml new file mode 100644 index 0000000..63a0180 --- /dev/null +++ b/sendtrain/src/main/AndroidManifest.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/sendtrain/src/main/res/drawable/ic_launcher_background.xml b/sendtrain/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/sendtrain/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sendtrain/src/main/res/drawable/ic_launcher_foreground.xml b/sendtrain/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/sendtrain/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/sendtrain/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/sendtrain/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/sendtrain/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/sendtrain/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/sendtrain/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/sendtrain/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/sendtrain/src/main/res/mipmap-hdpi/ic_launcher.webp b/sendtrain/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/sendtrain/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/sendtrain/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/sendtrain/src/main/res/mipmap-mdpi/ic_launcher.webp b/sendtrain/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/sendtrain/src/main/res/mipmap-xhdpi/ic_launcher.webp b/sendtrain/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/sendtrain/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/sendtrain/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/sendtrain/src/main/res/values-night/themes.xml b/sendtrain/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..929b64e --- /dev/null +++ b/sendtrain/src/main/res/values-night/themes.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/sendtrain/src/main/res/values/colors.xml b/sendtrain/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/sendtrain/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/sendtrain/src/main/res/values/strings.xml b/sendtrain/src/main/res/values/strings.xml new file mode 100644 index 0000000..78ffe0c --- /dev/null +++ b/sendtrain/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + SendTrain + \ No newline at end of file diff --git a/sendtrain/src/main/res/values/themes.xml b/sendtrain/src/main/res/values/themes.xml new file mode 100644 index 0000000..396fe8f --- /dev/null +++ b/sendtrain/src/main/res/values/themes.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/sendtrain/src/test/java/com/sendtrain/sendtrain/ExampleUnitTest.java b/sendtrain/src/test/java/com/sendtrain/sendtrain/ExampleUnitTest.java new file mode 100644 index 0000000..f82bdd4 --- /dev/null +++ b/sendtrain/src/test/java/com/sendtrain/sendtrain/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.sendtrain.sendtrain; + +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 -- 2.47.2 From 55a435718df9e1c595d23341a7993aebba400e7c Mon Sep 17 00:00:00 2001 From: Joshua Burman Date: Sun, 24 Nov 2024 17:22:27 -0500 Subject: [PATCH 02/13] updated pub --- lib/classes/activity_action.dart | 54 +++- lib/classes/media.dart | 1 - lib/widgets/activities_header.dart | 6 +- lib/widgets/activity_card.dart | 21 +- lib/widgets/media_card.dart | 4 +- lib/widgets/session_card.dart | 105 ++++--- pubspec.lock | 437 +++++++++++++++++++++++++++-- pubspec.yaml | 3 + 8 files changed, 526 insertions(+), 105 deletions(-) diff --git a/lib/classes/activity_action.dart b/lib/classes/activity_action.dart index cb1cad9..29befd5 100644 --- a/lib/classes/activity_action.dart +++ b/lib/classes/activity_action.dart @@ -1,17 +1,43 @@ class ActivityAction { - ActivityAction( - {required this.id, - required this.title, - required this.description, - this.repetitions, - this.time, - this.weight}); + int id; + String title; + String description; + Set activityActionSet; - final int id; - final String title; - final String description; - final int? repetitions; - final int? weight; - // in milliseconds - final int? time; + ActivityAction({ + required this.id, + required this.title, + required this.description, + required this.activityActionSet, + }); +} + +class Set { + String type; + int total; + int rest; + Reps reps; + + Set({ + required this.type, + required this.total, + required this.rest, + required this.reps, + }); +} + +class Reps { + String type; + List tempo; + List amounts; + List weights; + int rest; + + Reps({ + required this.type, + required this.tempo, + required this.amounts, + required this.weights, + required this.rest, + }); } diff --git a/lib/classes/media.dart b/lib/classes/media.dart index 7054f0a..1788660 100644 --- a/lib/classes/media.dart +++ b/lib/classes/media.dart @@ -1,4 +1,3 @@ -import 'package:flutter/material.dart'; class Media { Media( diff --git a/lib/widgets/activities_header.dart b/lib/widgets/activities_header.dart index 75c4d6d..4411663 100644 --- a/lib/widgets/activities_header.dart +++ b/lib/widgets/activities_header.dart @@ -21,12 +21,12 @@ class _ActivitiesHeaderState extends State { @override Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.only(bottom: 10), + return const Padding( + padding: EdgeInsets.only(bottom: 10), child: Row( mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: const [ + children: [ Padding( padding: EdgeInsets.fromLTRB(10, 0, 10, 0), child: Text( diff --git a/lib/widgets/activity_card.dart b/lib/widgets/activity_card.dart index 79286e2..f6b3dc6 100644 --- a/lib/widgets/activity_card.dart +++ b/lib/widgets/activity_card.dart @@ -14,11 +14,22 @@ class ActivityCard extends StatelessWidget { actions: List.generate( 10, (i) => ActivityAction( - id: 1, - title: 'exercise', - description: 'description', - repetitions: 5, - time: 5200))); + id: 1, + title: 'test action', + description:'test description', + activityActionSet: Set( + type: 'drop_set', + total: 3, + rest: 3000, + reps: Reps( + type: 'count', + tempo: [2,3,5], + amounts: [5,3,2], + weights: [50,70,80], + rest: 200 + ) + ) + ),)); @override Widget build(BuildContext context) { diff --git a/lib/widgets/media_card.dart b/lib/widgets/media_card.dart index 033c312..e47af51 100644 --- a/lib/widgets/media_card.dart +++ b/lib/widgets/media_card.dart @@ -9,7 +9,7 @@ class MediaCard extends StatelessWidget { @override Widget build(BuildContext context) { - YoutubePlayerController _controller = YoutubePlayerController( + YoutubePlayerController controller = YoutubePlayerController( initialVideoId: media.reference, flags: const YoutubePlayerFlags( autoPlay: false, mute: true, showLiveFullscreenButton: false)); @@ -31,7 +31,7 @@ class MediaCard extends StatelessWidget { return Image(image: NetworkImage(media.reference)); } else if (media.type == "youtube") { return YoutubePlayer( - controller: _controller, + controller: controller, aspectRatio: 16 / 9, ); } diff --git a/lib/widgets/session_card.dart b/lib/widgets/session_card.dart index 2a28e97..4c756d1 100644 --- a/lib/widgets/session_card.dart +++ b/lib/widgets/session_card.dart @@ -19,7 +19,7 @@ class SessionCard extends StatelessWidget { Color color = (state == 0) ? const Color(0xff3A5FB6) - : ThemeData.dark(useMaterial3: true).colorScheme.background; + : ThemeData.dark(useMaterial3: true).colorScheme.surface; // place holder until we can retrieve real data final data = SessionModel( @@ -38,32 +38,22 @@ class SessionCard extends StatelessWidget { "Campus board session, focussing on explosiveness and contact strength.", actions: [ ActivityAction( - id: 1, - title: '1, 3, 5 - left hand start', - description: - 'move from rungs 1, 3, and 5, alternating arms on each movement', - repetitions: 1), - ActivityAction( - id: 2, - title: 'Rest', - description: 'rest for alotted time', - time: 15000), - ActivityAction( - id: 3, - title: '1, 3, 5 - right hand start', - description: - 'move from rungs 1, 3, and 5, alternating arms on each movement', - repetitions: 1), - ActivityAction( - id: 4, - title: 'Rest', - description: 'rest for alotted time', - time: 300000), - ActivityAction( - id: 5, - title: 'Repeat', - description: 'repeat cycle', - repetitions: 5) + id: 1, + title: 'test action', + description:'test description', + activityActionSet: Set( + type: 'drop_set', + total: 3, + rest: 3000, + reps: Reps( + type: 'count', + tempo: [2,3,5], + amounts: [5,3,2], + weights: [50,70,80], + rest: 200 + ) + ) + ), ], resources: ['https://www.youtube.com/watch?v=bLz0xp1PEm4']), ActivityModel( @@ -75,20 +65,22 @@ class SessionCard extends StatelessWidget { "Session focussed on attempting a climb at or beyond your perceived limit.", actions: [ ActivityAction( - id: 1, - title: 'attempt boulder', - description: 'attempt boulder project', - repetitions: 1), - ActivityAction( - id: 2, - title: 'Rest', - description: 'rest for alotted time', - time: 300000), - ActivityAction( - id: 5, - title: 'Repeat', - description: 'repeat cycle', - repetitions: 5) + id: 1, + title: 'test action', + description:'test description', + activityActionSet: Set( + type: 'drop_set', + total: 3, + rest: 3000, + reps: Reps( + type: 'count', + tempo: [2,3,5], + amounts: [5,3,2], + weights: [50,70,80], + rest: 200 + ) + ) + ), ], resources: ['https://www.youtube.com/watch?v=dyAvbUvY_PU']), ActivityModel( @@ -100,21 +92,22 @@ class SessionCard extends StatelessWidget { "Weight pullups to increase strength and maximal pulling force.", actions: [ ActivityAction( - id: 1, - title: 'pull ups', - description: 'pull ups', - repetitions: 5, - weight: 100), - ActivityAction( - id: 2, - title: 'Rest', - description: 'rest for alotted time', - time: 300000), - ActivityAction( - id: 5, - title: 'Repeat', - description: 'repeat cycle', - repetitions: 5) + id: 1, + title: 'test action', + description:'test description', + activityActionSet: Set( + type: 'drop_set', + total: 3, + rest: 3000, + reps: Reps( + type: 'count', + tempo: [2,3,5], + amounts: [5,3,2], + weights: [50,70,80], + rest: 200 + ) + ) + ), ], resources: ['https://www.youtube.com/watch?v=dyAvbUvY_PU']), ], diff --git a/pubspec.lock b/pubspec.lock index edacd6d..b812f4f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,14 +1,43 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 + url: "https://pub.dev" + source: hosted + version: "72.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.2" + analyzer: + dependency: transitive + description: + name: analyzer + sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 + url: "https://pub.dev" + source: hosted + version: "6.7.0" + args: + dependency: transitive + description: + name: args + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 + url: "https://pub.dev" + source: hosted + version: "2.6.0" async: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" boolean_selector: dependency: transitive description: @@ -17,14 +46,86 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" + build: + dependency: transitive + description: + name: build + sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + build_config: + dependency: transitive + description: + name: build_config + sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + url: "https://pub.dev" + source: hosted + version: "1.1.1" + build_daemon: + dependency: transitive + description: + name: build_daemon + sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1" + url: "https://pub.dev" + source: hosted + version: "4.0.1" + build_resolvers: + dependency: transitive + description: + name: build_resolvers + sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" + url: "https://pub.dev" + source: hosted + version: "2.4.2" + build_runner: + dependency: "direct dev" + description: + name: build_runner + sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d" + url: "https://pub.dev" + source: hosted + version: "2.4.13" + build_runner_core: + dependency: transitive + description: + name: build_runner_core + sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799" + url: "https://pub.dev" + source: hosted + version: "7.3.0" + built_collection: + dependency: transitive + description: + name: built_collection + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" + source: hosted + version: "5.1.1" + built_value: + dependency: transitive + description: + name: built_value + sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb + url: "https://pub.dev" + source: hosted + version: "8.9.2" characters: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff + url: "https://pub.dev" + source: hosted + version: "2.0.3" clock: dependency: transitive description: @@ -33,14 +134,38 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.1" + code_builder: + dependency: transitive + description: + name: code_builder + sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37 + url: "https://pub.dev" + source: hosted + version: "4.10.0" collection: dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.18.0" + convert: + dependency: transitive + description: + name: convert + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" + source: hosted + version: "3.1.1" + crypto: + dependency: transitive + description: + name: crypto + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + url: "https://pub.dev" + source: hosted + version: "3.0.3" cupertino_icons: dependency: "direct main" description: @@ -49,6 +174,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.5" + dart_style: + dependency: transitive + description: + name: dart_style + sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" + url: "https://pub.dev" + source: hosted + version: "2.3.6" fake_async: dependency: transitive description: @@ -57,6 +190,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.1" + file: + dependency: transitive + description: + name: file + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + url: "https://pub.dev" + source: hosted + version: "7.0.1" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be + url: "https://pub.dev" + source: hosted + version: "1.1.1" flutter: dependency: "direct main" description: flutter @@ -83,6 +232,46 @@ packages: description: flutter source: sdk version: "0.0.0" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 + url: "https://pub.dev" + source: hosted + version: "4.0.0" + glob: + dependency: transitive + description: + name: glob + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + graphs: + dependency: transitive + description: + name: graphs + sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 + url: "https://pub.dev" + source: hosted + version: "2.3.1" + http_multi_server: + dependency: transitive + description: + name: http_multi_server + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" + source: hosted + version: "3.2.1" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" + source: hosted + version: "4.0.2" intl: dependency: "direct main" description: @@ -91,6 +280,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.18.0" + io: + dependency: transitive + description: + name: io + sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + url: "https://pub.dev" + source: hosted + version: "1.0.4" js: dependency: transitive description: @@ -99,6 +296,46 @@ packages: url: "https://pub.dev" source: hosted version: "0.6.5" + json_annotation: + dependency: "direct main" + description: + name: json_annotation + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" + url: "https://pub.dev" + source: hosted + version: "4.9.0" + json_serializable: + dependency: "direct dev" + description: + name: json_serializable + sha256: c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c + url: "https://pub.dev" + source: hosted + version: "6.9.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + url: "https://pub.dev" + source: hosted + version: "10.0.5" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + url: "https://pub.dev" + source: hosted + version: "3.0.5" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" lints: dependency: transitive description: @@ -107,38 +344,94 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.1" + logging: + dependency: transitive + description: + name: logging + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + macros: + dependency: transitive + description: + name: macros + sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + url: "https://pub.dev" + source: hosted + version: "0.1.2-main.4" matcher: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.15.0" + mime: + dependency: transitive + description: + name: mime + sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a" + url: "https://pub.dev" + source: hosted + version: "1.0.6" + package_config: + dependency: transitive + description: + name: package_config + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" + source: hosted + version: "2.1.0" path: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.9.0" + pool: + dependency: transitive + description: + name: pool + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" + source: hosted + version: "1.5.1" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + pubspec_parse: + dependency: transitive + description: + name: pubspec_parse + sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 + url: "https://pub.dev" + source: hosted + version: "1.3.0" scaler: dependency: "direct main" description: @@ -147,35 +440,75 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.2+1" + shelf: + dependency: transitive + description: + name: shelf + sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + url: "https://pub.dev" + source: hosted + version: "1.4.1" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + url: "https://pub.dev" + source: hosted + version: "1.0.4" sky_engine: dependency: transitive description: flutter source: sdk version: "0.0.99" + source_gen: + dependency: transitive + description: + name: source_gen + sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" + url: "https://pub.dev" + source: hosted + version: "1.5.0" + source_helper: + dependency: transitive + description: + name: source_helper + sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd" + url: "https://pub.dev" + source: hosted + version: "1.3.4" source_span: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" + stream_transform: + dependency: transitive + description: + name: stream_transform + sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + url: "https://pub.dev" + source: hosted + version: "2.1.0" string_scanner: dependency: transitive description: @@ -196,10 +529,26 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.7.2" + timing: + dependency: transitive + description: + name: timing + sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + url: "https://pub.dev" + source: hosted + version: "1.0.1" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" + source: hosted + version: "1.3.2" vector_math: dependency: transitive description: @@ -208,6 +557,46 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + url: "https://pub.dev" + source: hosted + version: "14.2.5" + watcher: + dependency: transitive + description: + name: watcher + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + url: "https://pub.dev" + source: hosted + version: "0.5.1" + web_socket_channel: + dependency: transitive + description: + name: web_socket_channel + sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" + url: "https://pub.dev" + source: hosted + version: "2.4.5" + yaml: + dependency: transitive + description: + name: yaml + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" + source: hosted + version: "3.1.2" youtube_player_flutter: dependency: "direct main" description: @@ -217,5 +606,5 @@ packages: source: hosted version: "8.1.2" sdks: - dart: ">=2.19.2 <3.0.0" - flutter: ">=3.0.0" + dart: ">=3.5.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/pubspec.yaml b/pubspec.yaml index af6540e..063cff2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -38,6 +38,7 @@ dependencies: scaler: ^1.1.2+1 intl: ^0.18.0 youtube_player_flutter: ^8.1.2 + json_annotation: ^4.9.0 flutter_launcher_name: name: "SendTrain" @@ -52,6 +53,8 @@ dev_dependencies: # package. See that file for information about deactivating specific lint # rules and activating additional ones. flutter_lints: ^2.0.0 + build_runner: ^2.4.13 + json_serializable: ^6.9.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec -- 2.47.2 From 88021cdadee35664438dcc2daa4fb1cd0dc211fe Mon Sep 17 00:00:00 2001 From: Joshua Burman Date: Sun, 24 Nov 2024 18:02:17 -0500 Subject: [PATCH 03/13] full screen activity view --- lib/widgets/session_view.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/widgets/session_view.dart b/lib/widgets/session_view.dart index ce7a1d3..a2cd051 100644 --- a/lib/widgets/session_view.dart +++ b/lib/widgets/session_view.dart @@ -88,7 +88,7 @@ class SessionViewActivities extends StatelessWidget { .animate(animation); return SlideTransition( position: custom, - child: Dialog( + child: Dialog.fullscreen( child: Flex( direction: Axis.vertical, mainAxisSize: MainAxisSize.min, -- 2.47.2 From ec6381f04de1322eed7a5384900d473d69215e96 Mon Sep 17 00:00:00 2001 From: Joshua Burman Date: Mon, 25 Nov 2024 17:44:50 -0500 Subject: [PATCH 04/13] prep for activity screen --- lib/widgets/session_view.dart | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/widgets/session_view.dart b/lib/widgets/session_view.dart index a2cd051..f599ba1 100644 --- a/lib/widgets/session_view.dart +++ b/lib/widgets/session_view.dart @@ -64,7 +64,7 @@ class SessionViewActivities extends StatelessWidget { Widget build(BuildContext context) { return Expanded( child: ListView.builder( - shrinkWrap: true, + // shrinkWrap: true, padding: const EdgeInsets.fromLTRB(10, 0, 10, 0), itemCount: activities?.length, itemBuilder: (BuildContext context, int index) { @@ -92,15 +92,14 @@ class SessionViewActivities extends StatelessWidget { child: Flex( direction: Axis.vertical, mainAxisSize: MainAxisSize.min, - children: [ - Text('${activities?[index].title}'), - Text('${activities?[index].categories}'), - Text('${activities?[index].description}'), - Text('${activities?[index].resources}'), - Text('${activities?[index].actions[0].title}'), - Text( - '${activities?[index].actions[0].description}'), - ]))); + children: [ + AppBar( + centerTitle: true, + title: const Text('test activity', + style: TextStyle(fontSize: 15)), + ), + ], + ))); }, barrierDismissible: true, barrierLabel: '', -- 2.47.2 From 0fe3d65bb8d7980eb39f4bdf3f5515b5d7862c0e Mon Sep 17 00:00:00 2001 From: Joshua Burman Date: Mon, 25 Nov 2024 17:47:27 -0500 Subject: [PATCH 05/13] formatting --- lib/widgets/session_view.dart | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/widgets/session_view.dart b/lib/widgets/session_view.dart index f599ba1..3caf4a8 100644 --- a/lib/widgets/session_view.dart +++ b/lib/widgets/session_view.dart @@ -90,16 +90,16 @@ class SessionViewActivities extends StatelessWidget { position: custom, child: Dialog.fullscreen( child: Flex( - direction: Axis.vertical, - mainAxisSize: MainAxisSize.min, - children: [ - AppBar( - centerTitle: true, - title: const Text('test activity', - style: TextStyle(fontSize: 15)), - ), - ], - ))); + direction: Axis.vertical, + mainAxisSize: MainAxisSize.min, + children: [ + AppBar( + centerTitle: true, + title: const Text('test activity', + style: TextStyle(fontSize: 15)), + ), + ], + ))); }, barrierDismissible: true, barrierLabel: '', -- 2.47.2 From 6b319a8d96fddff73ebc35d28ea233ebd11ad42f Mon Sep 17 00:00:00 2001 From: Joshua Burman Date: Mon, 25 Nov 2024 17:57:22 -0500 Subject: [PATCH 06/13] add version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0c047fe..844bae7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# SendTrain +# SendTrain v0.2 Mobile app for community driven climbing training and support. -- 2.47.2 From e3a09458d8ffb621141b21ad6e43460a1c38fb15 Mon Sep 17 00:00:00 2001 From: Joshua Burman Date: Mon, 25 Nov 2024 17:58:59 -0500 Subject: [PATCH 07/13] 0.2.1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 844bae7..afae44a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# SendTrain v0.2 +# SendTrain v0.2.1 Mobile app for community driven climbing training and support. -- 2.47.2 From 780e270c15647ba261635e7435887deb0d0ffe18 Mon Sep 17 00:00:00 2001 From: Joshua Burman Date: Mon, 25 Nov 2024 18:00:07 -0500 Subject: [PATCH 08/13] 0.2.2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index afae44a..6e36ddf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# SendTrain v0.2.1 +# SendTrain v0.2.2 Mobile app for community driven climbing training and support. -- 2.47.2 From b273979ac0971bc3b70a114d5646ebeb4d6d5cc5 Mon Sep 17 00:00:00 2001 From: Joshua Burman Date: Wed, 27 Nov 2024 00:32:01 -0500 Subject: [PATCH 09/13] refactor and new activity view --- lib/screens/activities_screen.dart | 29 +++++++- lib/widgets/activity_card.dart | 70 +++++++++--------- lib/widgets/activity_view.dart | 34 +++++++++ lib/widgets/session_card.dart | 4 +- lib/widgets/session_view.dart | 115 +++++------------------------ 5 files changed, 119 insertions(+), 133 deletions(-) create mode 100644 lib/widgets/activity_view.dart diff --git a/lib/screens/activities_screen.dart b/lib/screens/activities_screen.dart index 71e4adf..2beb613 100644 --- a/lib/screens/activities_screen.dart +++ b/lib/screens/activities_screen.dart @@ -1,4 +1,6 @@ import 'package:flutter/material.dart'; +import 'package:sendtrain/classes/activity_action.dart'; +import 'package:sendtrain/models/activity_model.dart'; import '../widgets/activities_header.dart'; import '../widgets/activity_card.dart'; @@ -11,9 +13,34 @@ class ActivitiesScreen extends StatefulWidget { } class _ActivitiesScreenState extends State { + + final data = ActivityModel( + id: 1, + categories: ['power'], + description: 'description', + title: 'activity', + type: 'fundamentals', + actions: List.generate( + 10, + (i) => ActivityAction( + id: 1, + title: 'test action', + description: 'test description', + activityActionSet: Set( + type: 'drop_set', + total: 3, + rest: 3000, + reps: Reps( + type: 'count', + tempo: [2, 3, 5], + amounts: [5, 3, 2], + weights: [50, 70, 80], + rest: 200))), + )); + @override Widget build(BuildContext context) { - List activities = List.generate(10, (i) => ActivityCard()); + List activities = List.generate(10, (i) => ActivityCard(activity: data)); return Padding( padding: const EdgeInsets.fromLTRB(10, 15, 10, 0), diff --git a/lib/widgets/activity_card.dart b/lib/widgets/activity_card.dart index f6b3dc6..2e8fc21 100644 --- a/lib/widgets/activity_card.dart +++ b/lib/widgets/activity_card.dart @@ -1,46 +1,48 @@ import 'package:flutter/material.dart'; -import 'package:sendtrain/classes/activity_action.dart'; import 'package:sendtrain/models/activity_model.dart'; +import 'package:sendtrain/widgets/activity_view.dart'; class ActivityCard extends StatelessWidget { - ActivityCard({super.key}); + const ActivityCard({super.key, required this.activity}); - final data = ActivityModel( - id: 1, - categories: ['power'], - description: 'description', - title: 'activity', - type: 'fundamentals', - actions: List.generate( - 10, - (i) => ActivityAction( - id: 1, - title: 'test action', - description:'test description', - activityActionSet: Set( - type: 'drop_set', - total: 3, - rest: 3000, - reps: Reps( - type: 'count', - tempo: [2,3,5], - amounts: [5,3,2], - weights: [50,70,80], - rest: 200 - ) - ) - ),)); + final ActivityModel activity; @override Widget build(BuildContext context) { return Card( - clipBehavior: Clip.hardEdge, - child: Align( - alignment: Alignment.center, - child: Text( - data.title, - style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold), - ), + color: const Color(0xff3A5FB6), + child: ListTile( + // dense: true, + focusColor: const Color(0xff3A5FB6), + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.all(Radius.elliptical(10, 10))), + onTap: () => showGeneralDialog( + barrierColor: Colors.black.withOpacity(0.5), + transitionDuration: const Duration(milliseconds: 220), + transitionBuilder: (BuildContext context, + Animation animation, + Animation secondaryAnimation, + Widget child) { + Animation custom = Tween( + begin: const Offset(0.0, 1.0), + end: const Offset(0.0, 0.0)) + .animate(animation); + return SlideTransition( + position: custom, + child: Dialog.fullscreen( + child: ActivityView(activity: activity))); + }, + barrierDismissible: true, + barrierLabel: '', + context: context, + pageBuilder: (context, animation1, animation2) { + return Container(); + }), + enableFeedback: true, + title: Text(maxLines: 1, activity.title), + subtitle: Padding( + padding: const EdgeInsets.only(bottom: 3), + child: Text(maxLines: 2, activity.description)), )); } } diff --git a/lib/widgets/activity_view.dart b/lib/widgets/activity_view.dart new file mode 100644 index 0000000..68197ce --- /dev/null +++ b/lib/widgets/activity_view.dart @@ -0,0 +1,34 @@ +import 'package:flutter/material.dart'; +import 'package:sendtrain/models/activity_model.dart'; + +class ActivityView extends StatelessWidget { + const ActivityView({super.key, required this.activity}); + + final ActivityModel activity; + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + AppBar( + centerTitle: true, + title: Text(activity.title, style: const TextStyle(fontSize: 25)), + ), + Padding( + padding: + const EdgeInsets.only(top: 25, bottom: 10, left: 15, right: 15), + child: Text( + textAlign: TextAlign.center, + style: const TextStyle(fontSize: 20), + activity.description)), + const Padding( + padding: EdgeInsets.only(top: 25, bottom: 10), + child: Text( + style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold), + 'Actions:')), + ], + ); + } +} diff --git a/lib/widgets/session_card.dart b/lib/widgets/session_card.dart index 4c756d1..f358334 100644 --- a/lib/widgets/session_card.dart +++ b/lib/widgets/session_card.dart @@ -19,7 +19,7 @@ class SessionCard extends StatelessWidget { Color color = (state == 0) ? const Color(0xff3A5FB6) - : ThemeData.dark(useMaterial3: true).colorScheme.surface; + : ThemeData.dark(useMaterial3: true).colorScheme.surfaceBright; // place holder until we can retrieve real data final data = SessionModel( @@ -35,7 +35,7 @@ class SessionCard extends StatelessWidget { type: 'fundamental', categories: ['strength', 'power'], description: - "Campus board session, focussing on explosiveness and contact strength.", + "Campus board session, focusing on explosiveness and contact strength.", actions: [ ActivityAction( id: 1, diff --git a/lib/widgets/session_view.dart b/lib/widgets/session_view.dart index 3caf4a8..4eb74d0 100644 --- a/lib/widgets/session_view.dart +++ b/lib/widgets/session_view.dart @@ -5,6 +5,7 @@ import 'package:intl/date_symbol_data_local.dart'; import 'package:sendtrain/classes/media.dart'; import 'package:sendtrain/models/activity_model.dart'; import 'package:sendtrain/models/session_model.dart'; +import 'package:sendtrain/widgets/activity_card.dart'; import 'package:sendtrain/widgets/media_card.dart'; class SessionView extends StatelessWidget { @@ -18,17 +19,18 @@ class SessionView extends StatelessWidget { final DateFormat dateFormat = DateFormat('yyyy-MM-dd'); return Column( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, children: [ AppBar( centerTitle: true, title: Text('Session @ ${dateFormat.format(data.date)}', - style: const TextStyle(fontSize: 15)), + style: const TextStyle(fontSize: 25)), ), Padding( - padding: const EdgeInsets.only(left: 20, right: 20, bottom: 10), + padding: + const EdgeInsets.only(left: 20, right: 20, top: 15, bottom: 10), child: Text( + textAlign: TextAlign.left, maxLines: 1, style: const TextStyle(fontSize: 25, fontWeight: FontWeight.bold), @@ -36,13 +38,19 @@ class SessionView extends StatelessWidget { SessionViewAchievements(achievements: data.achievements), Padding( padding: const EdgeInsets.only(left: 15, right: 15), - child: Text(textAlign: TextAlign.center, data.content)), + child: Text(textAlign: TextAlign.left, data.content)), + const Padding( + padding: EdgeInsets.fromLTRB(15, 30, 0, 10), + child: Text( + textAlign: TextAlign.left, + style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold), + 'Media:')), SessionViewMedia(media: data.media), const Padding( - padding: EdgeInsets.only(top: 25, bottom: 10), + padding: EdgeInsets.fromLTRB(15, 30, 0, 10), child: Text( - style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold), - 'Activities:')), + style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold), + 'Activites:')), SessionViewActivities(activities: data.activities), // TextButton( // onPressed: () { @@ -68,52 +76,7 @@ class SessionViewActivities extends StatelessWidget { padding: const EdgeInsets.fromLTRB(10, 0, 10, 0), itemCount: activities?.length, itemBuilder: (BuildContext context, int index) { - return Card( - color: const Color(0xff3A5FB6), - child: ListTile( - // dense: true, - focusColor: const Color(0xff3A5FB6), - shape: const RoundedRectangleBorder( - borderRadius: BorderRadius.all(Radius.elliptical(10, 10))), - onTap: () => showGeneralDialog( - barrierColor: Colors.black.withOpacity(0.5), - transitionDuration: const Duration(milliseconds: 220), - transitionBuilder: (BuildContext context, - Animation animation, - Animation secondaryAnimation, - Widget child) { - Animation custom = Tween( - begin: const Offset(0.0, 1.0), - end: const Offset(0.0, 0.0)) - .animate(animation); - return SlideTransition( - position: custom, - child: Dialog.fullscreen( - child: Flex( - direction: Axis.vertical, - mainAxisSize: MainAxisSize.min, - children: [ - AppBar( - centerTitle: true, - title: const Text('test activity', - style: TextStyle(fontSize: 15)), - ), - ], - ))); - }, - barrierDismissible: true, - barrierLabel: '', - context: context, - pageBuilder: (context, animation1, animation2) { - return Container(); - }), - enableFeedback: true, - title: Text(maxLines: 1, '${activities?[index].title}'), - subtitle: Padding( - padding: const EdgeInsets.only(bottom: 3), - child: - Text(maxLines: 2, '${activities?[index].description}')), - )); + return ActivityCard(activity: activities![index]); }, )); } @@ -143,22 +106,8 @@ class SessionViewAchievements extends StatelessWidget { visualDensity: VisualDensity.compact, avatar: const Icon(Icons.check_circle_outline), label: Text(maxLines: 1, '${achievements?[index]}'), - onPressed: () { - // setState(() { - // favorite = !favorite; - // }); - }, + onPressed: () {}, )); - // return Card( - // child: ListTile( - // // dense: true, - // focusColor: Colors.deepPurple, - // shape: const RoundedRectangleBorder( - // borderRadius: BorderRadius.all(Radius.circular(10))), - // onTap: () {}, - // enableFeedback: true, - // title: Text(maxLines: 1, '${achievements?[index]}'), - // )); }, ))), ], @@ -178,16 +127,11 @@ class SessionViewMedia extends StatelessWidget { return Column( children: [ - const Padding( - padding: EdgeInsets.only(top: 25), - child: Text( - style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold), - 'Media:')), SizedBox( width: double.infinity, height: 100, child: GridView.count( - padding: const EdgeInsets.fromLTRB(15, 10, 0, 0), + padding: const EdgeInsets.fromLTRB(15, 0, 0, 0), scrollDirection: Axis.horizontal, crossAxisSpacing: 5, mainAxisSpacing: 5, @@ -197,24 +141,3 @@ class SessionViewMedia extends StatelessWidget { ); } } - -// SizedBox( -// height: 100, -// width: double.infinity, -// child: ListView.builder( -// // scrollDirection: Axis.horizontal, -// padding: const EdgeInsets.fromLTRB(10, 0, 10, 0), -// itemCount: media?.length, -// itemBuilder: (BuildContext context, int index) { -// return Card( -// child: ListTile( -// dense: true, -// focusColor: Colors.deepPurple, -// shape: const RoundedRectangleBorder( -// borderRadius: BorderRadius.all(Radius.circular(10))), -// onTap: () {}, -// enableFeedback: true, -// title: const Text(maxLines: 1, 'test'), -// )); -// })) - -- 2.47.2 From 1c8f03c97bc9e13d0652698ec4970c53299d3dd6 Mon Sep 17 00:00:00 2001 From: Joshua Burman Date: Wed, 27 Nov 2024 08:21:12 -0500 Subject: [PATCH 10/13] activity categories --- lib/widgets/activity_view.dart | 42 +++++++++++++++++++++++++++++++--- lib/widgets/session_view.dart | 22 +++++++++--------- 2 files changed, 50 insertions(+), 14 deletions(-) diff --git a/lib/widgets/activity_view.dart b/lib/widgets/activity_view.dart index 68197ce..0f7ec07 100644 --- a/lib/widgets/activity_view.dart +++ b/lib/widgets/activity_view.dart @@ -9,26 +9,62 @@ class ActivityView extends StatelessWidget { @override Widget build(BuildContext context) { return Column( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.start, + // mainAxisSize: MainAxisSize.min, + // mainAxisAlignment: MainAxisAlignment.start, children: [ AppBar( centerTitle: true, title: Text(activity.title, style: const TextStyle(fontSize: 25)), ), + ActivityViewCategories(categories: activity.categories), Padding( padding: const EdgeInsets.only(top: 25, bottom: 10, left: 15, right: 15), child: Text( - textAlign: TextAlign.center, + textAlign: TextAlign.left, style: const TextStyle(fontSize: 20), activity.description)), const Padding( padding: EdgeInsets.only(top: 25, bottom: 10), child: Text( + textAlign: TextAlign.left, style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold), 'Actions:')), ], ); } } + +class ActivityViewCategories extends StatelessWidget { + const ActivityViewCategories({super.key, this.categories}); + + final List? categories; + + @override + Widget build(BuildContext context) { + return Column( + children: [ + Padding( + padding: const EdgeInsets.only(bottom: 10), + child: SizedBox( + height: 40, + child: ListView.builder( + shrinkWrap: true, + scrollDirection: Axis.horizontal, + padding: const EdgeInsets.fromLTRB(10, 0, 10, 0), + itemCount: categories?.length, + itemBuilder: (BuildContext context, int index) { + return Padding( + padding: const EdgeInsets.only(right: 5), + child: ActionChip( + visualDensity: VisualDensity.compact, + avatar: const Icon(Icons.check_circle_outline), + label: Text(maxLines: 1, '${categories?[index]}'), + onPressed: () {}, + )); + }, + ))), + ], + ); + } +} diff --git a/lib/widgets/session_view.dart b/lib/widgets/session_view.dart index 4eb74d0..f17aa82 100644 --- a/lib/widgets/session_view.dart +++ b/lib/widgets/session_view.dart @@ -22,19 +22,19 @@ class SessionView extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ AppBar( - centerTitle: true, - title: Text('Session @ ${dateFormat.format(data.date)}', + // centerTitle: false, + title: Text(data.title, style: const TextStyle(fontSize: 25)), ), - Padding( - padding: - const EdgeInsets.only(left: 20, right: 20, top: 15, bottom: 10), - child: Text( - textAlign: TextAlign.left, - maxLines: 1, - style: - const TextStyle(fontSize: 25, fontWeight: FontWeight.bold), - data.title)), + // Padding( + // padding: + // const EdgeInsets.only(left: 20, right: 20, top: 15, bottom: 10), + // child: Text( + // textAlign: TextAlign.left, + // maxLines: 1, + // style: + // const TextStyle(fontSize: 25, fontWeight: FontWeight.bold), + // data.title)), SessionViewAchievements(achievements: data.achievements), Padding( padding: const EdgeInsets.only(left: 15, right: 15), -- 2.47.2 From a2812b40a039e715b9875b05d2a32de6e56f6032 Mon Sep 17 00:00:00 2001 From: Joshua Burman Date: Thu, 28 Nov 2024 17:19:31 -0500 Subject: [PATCH 11/13] add activity action view --- lib/widgets/activity_action_view.dart | 15 +++++++++++++ lib/widgets/activity_view.dart | 20 ++++++++++++----- lib/widgets/session_view.dart | 32 +++++++++++++-------------- 3 files changed, 45 insertions(+), 22 deletions(-) create mode 100644 lib/widgets/activity_action_view.dart diff --git a/lib/widgets/activity_action_view.dart b/lib/widgets/activity_action_view.dart new file mode 100644 index 0000000..3264fdf --- /dev/null +++ b/lib/widgets/activity_action_view.dart @@ -0,0 +1,15 @@ +import 'package:flutter/material.dart'; +import 'package:sendtrain/classes/activity_action.dart'; + +class ActivityActionView extends StatefulWidget { + const ActivityActionView({super.key, required this.action}); + + final ActivityAction action; + + @override + State createState() { + // TODO: implement createState + throw UnimplementedError(); + } + +} \ No newline at end of file diff --git a/lib/widgets/activity_view.dart b/lib/widgets/activity_view.dart index 0f7ec07..5be5d7a 100644 --- a/lib/widgets/activity_view.dart +++ b/lib/widgets/activity_view.dart @@ -9,23 +9,31 @@ class ActivityView extends StatelessWidget { @override Widget build(BuildContext context) { return Column( - // mainAxisSize: MainAxisSize.min, - // mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, children: [ AppBar( centerTitle: true, - title: Text(activity.title, style: const TextStyle(fontSize: 25)), + title: const Text('Activity', + style: TextStyle(fontSize: 15)), ), + Padding( + padding: + const EdgeInsets.only(left: 15, right: 20, top: 15, bottom: 10), + child: Text( + maxLines: 1, + style: + const TextStyle(fontSize: 25, fontWeight: FontWeight.bold), + activity.title)), ActivityViewCategories(categories: activity.categories), Padding( padding: - const EdgeInsets.only(top: 25, bottom: 10, left: 15, right: 15), + const EdgeInsets.only(top: 0, bottom: 10, left: 15, right: 15), child: Text( textAlign: TextAlign.left, - style: const TextStyle(fontSize: 20), + style: const TextStyle(fontSize: 15), activity.description)), const Padding( - padding: EdgeInsets.only(top: 25, bottom: 10), + padding: EdgeInsets.fromLTRB(15, 30, 0, 10), child: Text( textAlign: TextAlign.left, style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold), diff --git a/lib/widgets/session_view.dart b/lib/widgets/session_view.dart index f17aa82..fa6002a 100644 --- a/lib/widgets/session_view.dart +++ b/lib/widgets/session_view.dart @@ -22,34 +22,34 @@ class SessionView extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ AppBar( - // centerTitle: false, - title: Text(data.title, - style: const TextStyle(fontSize: 25)), + centerTitle: true, + title: Text('Session @ ${dateFormat.format(data.date)}', + style: const TextStyle(fontSize: 15)), ), - // Padding( - // padding: - // const EdgeInsets.only(left: 20, right: 20, top: 15, bottom: 10), - // child: Text( - // textAlign: TextAlign.left, - // maxLines: 1, - // style: - // const TextStyle(fontSize: 25, fontWeight: FontWeight.bold), - // data.title)), + Padding( + padding: + const EdgeInsets.only(left: 15, right: 20, top: 15, bottom: 10), + child: Text( + maxLines: 1, + style: + const TextStyle(fontSize: 25, fontWeight: FontWeight.bold), + data.title)), SessionViewAchievements(achievements: data.achievements), Padding( padding: const EdgeInsets.only(left: 15, right: 15), - child: Text(textAlign: TextAlign.left, data.content)), + child: Text( + style: const TextStyle(fontSize: 15), + data.content)), const Padding( padding: EdgeInsets.fromLTRB(15, 30, 0, 10), child: Text( - textAlign: TextAlign.left, - style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold), + style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold), 'Media:')), SessionViewMedia(media: data.media), const Padding( padding: EdgeInsets.fromLTRB(15, 30, 0, 10), child: Text( - style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold), + style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold), 'Activites:')), SessionViewActivities(activities: data.activities), // TextButton( -- 2.47.2 From 8890346b59379899395218a051bd3c1c61c378e6 Mon Sep 17 00:00:00 2001 From: Joshua Burman Date: Fri, 29 Nov 2024 01:06:22 -0500 Subject: [PATCH 12/13] not working but trying... --- lib/widgets/activity_action_view.dart | 43 +++++++++++++++-- lib/widgets/activity_view.dart | 66 +++++++++++++++------------ 2 files changed, 77 insertions(+), 32 deletions(-) diff --git a/lib/widgets/activity_action_view.dart b/lib/widgets/activity_action_view.dart index 3264fdf..f4d7841 100644 --- a/lib/widgets/activity_action_view.dart +++ b/lib/widgets/activity_action_view.dart @@ -7,9 +7,46 @@ class ActivityActionView extends StatefulWidget { final ActivityAction action; @override - State createState() { - // TODO: implement createState - throw UnimplementedError(); + State createState() => _ActivityActionViewState(); +} + +class _ActivityActionViewState extends State { + @override + Widget build(BuildContext context) { + return Column( + children: [ + Expanded( + child: ListView( + children: [ + Text( + textAlign: TextAlign.left, + style: const TextStyle(fontSize: 15), + widget.action.description) + ], + ), + ), + ], + ); + // return Column( + // children: [Expanded( + // child: Column( + // children: [ + // Text( + // textAlign: TextAlign.left, + // style: const TextStyle(fontSize: 15), + // widget.action.description), + // ] + // ), + // ), + // // this will be you container + // const Column(children: [ + // Text( + // textAlign: TextAlign.left, + // style: TextStyle(fontSize: 15), + // 'bottom') + // ],) + // ], + // ); } } \ No newline at end of file diff --git a/lib/widgets/activity_view.dart b/lib/widgets/activity_view.dart index 5be5d7a..9770a38 100644 --- a/lib/widgets/activity_view.dart +++ b/lib/widgets/activity_view.dart @@ -1,5 +1,7 @@ import 'package:flutter/material.dart'; +import 'package:sendtrain/classes/activity_action.dart'; import 'package:sendtrain/models/activity_model.dart'; +import 'package:sendtrain/widgets/activity_action_view.dart'; class ActivityView extends StatelessWidget { const ActivityView({super.key, required this.activity}); @@ -8,37 +10,43 @@ class ActivityView extends StatelessWidget { @override Widget build(BuildContext context) { + var content = [ + AppBar( + centerTitle: true, + title: const Text('Activity', + style: TextStyle(fontSize: 15)), + ), + Padding( + padding: + const EdgeInsets.only(left: 15, right: 20, top: 15, bottom: 10), + child: Text( + maxLines: 1, + style: + const TextStyle(fontSize: 25, fontWeight: FontWeight.bold), + activity.title)), + ActivityViewCategories(categories: activity.categories), + Padding( + padding: + const EdgeInsets.only(top: 0, bottom: 10, left: 15, right: 15), + child: Text( + textAlign: TextAlign.left, + style: const TextStyle(fontSize: 15), + activity.description)), + const Padding( + padding: EdgeInsets.fromLTRB(15, 30, 0, 10), + child: Text( + textAlign: TextAlign.left, + style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold), + 'Actions:')) + ]; + + for (var action in activity.actions){ + content.add(ActivityActionView(action: action)); + } + return Column( crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppBar( - centerTitle: true, - title: const Text('Activity', - style: TextStyle(fontSize: 15)), - ), - Padding( - padding: - const EdgeInsets.only(left: 15, right: 20, top: 15, bottom: 10), - child: Text( - maxLines: 1, - style: - const TextStyle(fontSize: 25, fontWeight: FontWeight.bold), - activity.title)), - ActivityViewCategories(categories: activity.categories), - Padding( - padding: - const EdgeInsets.only(top: 0, bottom: 10, left: 15, right: 15), - child: Text( - textAlign: TextAlign.left, - style: const TextStyle(fontSize: 15), - activity.description)), - const Padding( - padding: EdgeInsets.fromLTRB(15, 30, 0, 10), - child: Text( - textAlign: TextAlign.left, - style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold), - 'Actions:')), - ], + children: content ); } } -- 2.47.2 From d7bd755c57e1ab9314e24c69ee982d6f7dffce56 Mon Sep 17 00:00:00 2001 From: Joshua Burman Date: Fri, 29 Nov 2024 12:24:11 -0500 Subject: [PATCH 13/13] Activity media --- lib/classes/activity_action.dart | 4 + lib/widgets/activity_action_view.dart | 54 +++++------ lib/widgets/activity_view.dart | 38 ++++++++ lib/widgets/session_card.dart | 126 ++++++++++++++++---------- 4 files changed, 142 insertions(+), 80 deletions(-) diff --git a/lib/classes/activity_action.dart b/lib/classes/activity_action.dart index 29befd5..8c1ece1 100644 --- a/lib/classes/activity_action.dart +++ b/lib/classes/activity_action.dart @@ -1,14 +1,18 @@ +import 'package:sendtrain/classes/media.dart'; + class ActivityAction { int id; String title; String description; Set activityActionSet; + List? media; ActivityAction({ required this.id, required this.title, required this.description, required this.activityActionSet, + this.media, }); } diff --git a/lib/widgets/activity_action_view.dart b/lib/widgets/activity_action_view.dart index f4d7841..f2da55a 100644 --- a/lib/widgets/activity_action_view.dart +++ b/lib/widgets/activity_action_view.dart @@ -13,40 +13,30 @@ class ActivityActionView extends StatefulWidget { class _ActivityActionViewState extends State { @override Widget build(BuildContext context) { - return Column( - children: [ - Expanded( - child: ListView( - children: [ - Text( - textAlign: TextAlign.left, - style: const TextStyle(fontSize: 15), - widget.action.description) - ], - ), - ), - ], - ); + return Expanded( + child: ListView.builder( + // shrinkWrap: true, + padding: const EdgeInsets.fromLTRB(10, 0, 10, 0), + itemCount: widget.action.activityActionSet.total, + itemBuilder: (BuildContext context, int index) { + return Text( + widget.action.description + ); + }, + )); // return Column( - // children: [Expanded( - // child: Column( - // children: [ - // Text( - // textAlign: TextAlign.left, - // style: const TextStyle(fontSize: 15), - // widget.action.description), - // ] + // children: [ + // Expanded( + // child: ListView( + // children: [ + // Text( + // textAlign: TextAlign.left, + // style: const TextStyle(fontSize: 15), + // widget.action.description) + // ], + // ), // ), - // ), - // // this will be you container - // const Column(children: [ - // Text( - // textAlign: TextAlign.left, - // style: TextStyle(fontSize: 15), - // 'bottom') - // ],) // ], // ); } - -} \ No newline at end of file +} diff --git a/lib/widgets/activity_view.dart b/lib/widgets/activity_view.dart index 9770a38..dffecb4 100644 --- a/lib/widgets/activity_view.dart +++ b/lib/widgets/activity_view.dart @@ -1,7 +1,9 @@ import 'package:flutter/material.dart'; import 'package:sendtrain/classes/activity_action.dart'; +import 'package:sendtrain/classes/media.dart'; import 'package:sendtrain/models/activity_model.dart'; import 'package:sendtrain/widgets/activity_action_view.dart'; +import 'package:sendtrain/widgets/media_card.dart'; class ActivityView extends StatelessWidget { const ActivityView({super.key, required this.activity}); @@ -32,6 +34,7 @@ class ActivityView extends StatelessWidget { textAlign: TextAlign.left, style: const TextStyle(fontSize: 15), activity.description)), + ActivityViewMedia(activity: activity), const Padding( padding: EdgeInsets.fromLTRB(15, 30, 0, 10), child: Text( @@ -84,3 +87,38 @@ class ActivityViewCategories extends StatelessWidget { ); } } + +class ActivityViewMedia extends StatelessWidget { + const ActivityViewMedia({super.key, this.activity}); + + final ActivityModel? activity; + + @override + Widget build(BuildContext context) { + List media = []; + + for (ActivityAction action in activity!.actions) { + if (action.media!.isNotEmpty) { + media.addAll(action.media as Iterable); + } + } + + List mediaCards = List.generate(media.length, + (i) => MediaCard(media: media[i])); + + return Column( + children: [ + SizedBox( + width: double.infinity, + height: 100, + child: GridView.count( + padding: const EdgeInsets.fromLTRB(15, 0, 0, 0), + scrollDirection: Axis.horizontal, + crossAxisSpacing: 5, + mainAxisSpacing: 5, + crossAxisCount: 1, + children: mediaCards)) + ], + ); + } +} diff --git a/lib/widgets/session_card.dart b/lib/widgets/session_card.dart index f358334..927eb9f 100644 --- a/lib/widgets/session_card.dart +++ b/lib/widgets/session_card.dart @@ -38,22 +38,32 @@ class SessionCard extends StatelessWidget { "Campus board session, focusing on explosiveness and contact strength.", actions: [ ActivityAction( - id: 1, - title: 'test action', - description:'test description', - activityActionSet: Set( - type: 'drop_set', - total: 3, - rest: 3000, - reps: Reps( - type: 'count', - tempo: [2,3,5], - amounts: [5,3,2], - weights: [50,70,80], - rest: 200 - ) - ) - ), + id: 1, + title: 'test action', + description: 'test description', + media: [ + Media( + id: 1, + reference: + 'https://www.climbing.com/wp-content/uploads/2022/06/campus-board-e1655470701154.jpeg', + type: 'image', + description: 'Campus board movement'), + Media( + id: 1, + reference: '7ACyeOP-Hxo', + type: 'youtube', + description: 'How to campus board') + ], + activityActionSet: Set( + type: 'drop_set', + total: 3, + rest: 3000, + reps: Reps( + type: 'count', + tempo: [2, 3, 5], + amounts: [5, 3, 2], + weights: [50, 70, 80], + rest: 200))), ], resources: ['https://www.youtube.com/watch?v=bLz0xp1PEm4']), ActivityModel( @@ -65,22 +75,32 @@ class SessionCard extends StatelessWidget { "Session focussed on attempting a climb at or beyond your perceived limit.", actions: [ ActivityAction( - id: 1, - title: 'test action', - description:'test description', - activityActionSet: Set( - type: 'drop_set', - total: 3, - rest: 3000, - reps: Reps( - type: 'count', - tempo: [2,3,5], - amounts: [5,3,2], - weights: [50,70,80], - rest: 200 - ) - ) - ), + id: 1, + title: 'test action', + description: 'test description', + media: [ + Media( + id: 1, + reference: + 'https://www.climbing.com/wp-content/uploads/2022/07/Fixed-44.jpg', + type: 'image', + description: 'Projecting a climb'), + Media( + id: 1, + reference: 'BgheYcxhrsw', + type: 'youtube', + description: 'How to project climbs') + ], + activityActionSet: Set( + type: 'drop_set', + total: 3, + rest: 3000, + reps: Reps( + type: 'count', + tempo: [2, 3, 5], + amounts: [5, 3, 2], + weights: [50, 70, 80], + rest: 200))), ], resources: ['https://www.youtube.com/watch?v=dyAvbUvY_PU']), ActivityModel( @@ -92,22 +112,32 @@ class SessionCard extends StatelessWidget { "Weight pullups to increase strength and maximal pulling force.", actions: [ ActivityAction( - id: 1, - title: 'test action', - description:'test description', - activityActionSet: Set( - type: 'drop_set', - total: 3, - rest: 3000, - reps: Reps( - type: 'count', - tempo: [2,3,5], - amounts: [5,3,2], - weights: [50,70,80], - rest: 200 - ) - ) - ), + id: 1, + title: 'test action', + description: 'test description', + media: [ + Media( + id: 1, + reference: + 'https://trainingforclimbing.com/wp-content/uploads/2016/03/hypergravity_pull-up-compress3-966x1024.jpg', + type: 'image', + description: 'Weighted Pullups'), + Media( + id: 1, + reference: '7TLG1mHQHgw', + type: 'youtube', + description: 'How to do weighted pullups') + ], + activityActionSet: Set( + type: 'drop_set', + total: 3, + rest: 3000, + reps: Reps( + type: 'count', + tempo: [2, 3, 5], + amounts: [5, 3, 2], + weights: [50, 70, 80], + rest: 200))), ], resources: ['https://www.youtube.com/watch?v=dyAvbUvY_PU']), ], -- 2.47.2