Code

Dev#196

Code

Merged

ST10195824 merged 106 commits intomainST10204902/PurrsonalTrainer:mainfrom devST10204902/PurrsonalTrainer:devCopy head branch name to clipboardNov 4, 2024

+3,971-814

Commits

Commits on Nov 1, 2024

• Merge pull request #175 from ST10204902/navigation-part-3

  Show description for b93855e
  joshua-harvey

  authored
  b93855e

  Copy full SHA for b93855e

• token

  ST10195824

  committed
  09922e8

  Copy full SHA for 09922e8

• Merge pull request #176 from ST10204902/WorkoutXPCalculator

  Show description for 4e5eb9c
  ST10195824

  authored
  4e5eb9c

  Copy full SHA for 4e5eb9c

• did push notifications

  JasperVanNiekerk

  committed
  21c9db2

  Copy full SHA for 21c9db2

• the users XP and level is saved to the database when they complete a workout

  ST10195824

  committed
  2145eb2

  Copy full SHA for 2145eb2

• Merge pull request #177 from ST10204902/WorkoutXPCalculator

  Show description for cbf6a62
  ST10195824

  authored
  cbf6a62

  Copy full SHA for cbf6a62

• Developed part of the UI for the CatFragment

  Show description for 834d5b0
  

  ST10180919

  committed
  834d5b0

  Copy full SHA for 834d5b0

• xp bar work

  

  ST10180919

  committed
  156077a

  Copy full SHA for 156077a

• Merge pull request #179 from ST10204902/xp-bar-frontend

  Show description for fc531d0
  joshua-harvey

  authored
  fc531d0

  Copy full SHA for fc531d0

Commits on Nov 2, 2024

• xp and levels now work as well as previous reps and weight

  ST10195824

  committed
  dc5b790

  Copy full SHA for dc5b790

• implemented profile setup

  Show description for 2764372
  

  ST10180919

  committed
  2764372

  Copy full SHA for 2764372

• Merge pull request #180 from ST10204902/profile-setup-implementation

  Show description for 1916e1c
  joshua-harvey

  authored
  1916e1c

  Copy full SHA for 1916e1c

• in app notifications work

  JasperVanNiekerk

  committed
  c00b48f

  Copy full SHA for c00b48f

• did push notifications

  JasperVanNiekerk

  committed
  f9808f0

  Copy full SHA for f9808f0

• in app notifications work

  JasperVanNiekerk

  committed
  bc97b89

  Copy full SHA for bc97b89

• Merge branch 'pushNotifications' of https://github.com/ST10204902/PurrsonalTrainer into pushNotifications

  JasperVanNiekerk

  committed
  27f1763

  Copy full SHA for 27f1763

• Merge pull request #181 from ST10204902/pushNotifications

  Show description for f6070de
  JasperVanNiekerk

  authored
  f6070de

  Copy full SHA for f6070de

• Merge branch 'dev' of https://github.com/ST10204902/PurrsonalTrainer into dev

  ST10195824

  committed
  cbfa454

  Copy full SHA for cbfa454

• added UI and functionality for CatSettingsActivity

  

  ST10180919

  committed
  3039b84

  Copy full SHA for 3039b84

• added the cat avatar to the CatFragment

  

  ST10180919

  committed
  b847d45

  Copy full SHA for b847d45

• Added Fur pattern support

  

  ST10180919

  committed
  a681c77

  Copy full SHA for a681c77

• added UI and functionality for CatSettingsActivity

  

  ST10180919

  committed
  8d63b75

  Copy full SHA for 8d63b75

• added the cat avatar to the CatFragment

  

  ST10180919

  committed
  2d67343

  Copy full SHA for 2d67343

• Added Fur pattern support

  

  ST10180919

  committed
  9475eb8

  Copy full SHA for 9475eb8

• Merge branch 'cat-settings-implementation' of https://github.com/ST10204902/PurrsonalTrainer into cat-settings-implementation

  

  ST10180919

  committed
  e29933a

  Copy full SHA for e29933a

• Merge pull request #182 from ST10204902/cat-settings-implementation

  Show description for 5418627
  joshua-harvey

  authored
  5418627

  Copy full SHA for 5418627

• hot fix

  ST10195824

  committed
  bdeabcf

  Copy full SHA for bdeabcf

• items

  ST10195824

  committed
  b4356f1

  Copy full SHA for b4356f1

• Merge pull request #183 from ST10204902/items

  Show description for 25fc22f
  ST10195824

  authored
  25fc22f

  Copy full SHA for 25fc22f

• hot fix

  ST10195824

  committed
  5f89742

  Copy full SHA for 5f89742

Commits on Nov 3, 2024

• Implemented UI for ShopChoiceActivity

  

  ST10180919

  committed
  79d6d77

  Copy full SHA for 79d6d77

• Merge pull request #184 from ST10204902/shop-choice-implementation

  Show description for 31004de
  joshua-harvey

  authored
  31004de

  Copy full SHA for 31004de

• Added backgrounds for both shops and created component for milkcoins

  

  ST10180919

  committed
  de31289

  Copy full SHA for de31289

• Added all the cats

  ST10144453

  committed
  a205649

  Copy full SHA for a205649

• Merge pull request #185 from ST10204902/Frontend-ShopItemComponent

  Show description for f0be071
  ST10144453

  authored
  f0be071

  Copy full SHA for f0be071

• fixed home screen being bouncy

  ST10195824

  committed
  be16cd6

  Copy full SHA for be16cd6

• app runs

  ST10195824

  committed
  f61612f

  Copy full SHA for f61612f

• fixed level being initilised to 0 when creating a new account

  ST10195824

  committed
  acb1414

  Copy full SHA for acb1414

• Merge pull request #186 from ST10204902/refactoring-routine-builder

  Show description for bca43e3
  ST10195824

  authored
  bca43e3

  Copy full SHA for bca43e3

• f

  ST10195824

  committed
  fa70c49

  Copy full SHA for fa70c49

• Merge pull request #187 from ST10204902/refactoring-routine-builder

  Show description for 0a7e574
  ST10195824

  authored
  0a7e574

  Copy full SHA for 0a7e574

• f

  ST10195824

  committed
  db1d17d

  Copy full SHA for db1d17d

• hot fix

  ST10195824

  committed
  4f51374

  Copy full SHA for 4f51374

• previous sets now works properly

  ST10195824

  committed
  03f7bfa

  Copy full SHA for 03f7bfa

• only shows previoussets that were selected as complete

  ST10195824

  committed
  a6c4268

  Copy full SHA for a6c4268

• now xp is only added for completed sets

  ST10195824

  committed
  03df4b1

  Copy full SHA for 03df4b1

• most reccent workouts are now displayed at the top in home fragment

  ST10195824

  committed
  4cb302f

  Copy full SHA for 4cb302f

• text inputs now clear themselves when focused

  ST10195824

  committed
  8b124e2

  Copy full SHA for 8b124e2

• I did things

  

  ST10180919

  committed
  2c95230

  Copy full SHA for 2c95230

• Added backgrounds for both shops and created component for milkcoins

  

  ST10180919

  committed
  2145839

  Copy full SHA for 2145839

• I did things

  

  ST10180919

  committed
  605a690

  Copy full SHA for 605a690

• Merge branch 'shop-frontend' of https://github.com/ST10204902/PurrsonalTrainer into shop-frontend

  

  ST10180919

  committed
  f0325f0

  Copy full SHA for f0325f0

• Merge pull request #188 from ST10204902/shop-frontend

  Show description for 8b3164e
  joshua-harvey

  authored
  8b3164e

  Copy full SHA for 8b3164e

• added anneme's item

  

  ST10180919

  committed
  281dc65

  Copy full SHA for 281dc65

• implement shop pop up functionality

  ST10144453

  committed
  1c5be76

  Copy full SHA for 1c5be76

• rebase now push

  ST10144453

  committed
  ce4711f

  Copy full SHA for ce4711f

• Merge pull request #189 from ST10204902/Frontend-ShopItemComponent

  Show description for c5476d8
  ST10144453

  authored
  c5476d8

  Copy full SHA for c5476d8

• start

  ST10195824

  committed
  d541d77

  Copy full SHA for d541d77

• d

  ST10195824

  committed
  759c621

  Copy full SHA for 759c621

• s

  ST10195824

  committed
  2bebd5a

  Copy full SHA for 2bebd5a

• d

  ST10195824

  committed
  bcffc43

  Copy full SHA for bcffc43

• d

  ST10195824

  committed
  f0cf2b3

  Copy full SHA for f0cf2b3

• you can buy items

  ST10195824

  committed
  b9f843a

  Copy full SHA for b9f843a

• Merge pull request #190 from ST10204902/gamified-stats

  Show description for e86111e
  ST10195824

  authored
  e86111e

  Copy full SHA for e86111e

Commits on Nov 4, 2024

• shop done

  ST10195824

  committed
  90db3b7

  Copy full SHA for 90db3b7

• Merge pull request #191 from ST10204902/gamified-stats

  Show description for f20e5e5
  ST10195824

  authored
  f20e5e5

  Copy full SHA for f20e5e5

• Finalized UI on the ProfileSetupActivity

  Show description for 421df76
  

  ST10180919

  committed
  421df76

  Copy full SHA for 421df76

• Update fragment_home.xml

  Show description for 28f3640
  

  ST10180919

  committed
  28f3640

  Copy full SHA for 28f3640

• All strings exported. Number values left as is.

  ST10204902

  committed
  2c4a3cd

  Copy full SHA for 2c4a3cd

• Update fragment_cat.xml

  Show description for 13becec
  

  ST10180919

  committed
  13becec

  Copy full SHA for 13becec

• Update component_milkcoins_amount.xml

  Show description for 5948824
  

  ST10180919

  committed
  5948824

  Copy full SHA for 5948824

• Update fragment_analysis.xml

  Show description for 659e89a
  

  ST10180919

  committed
  659e89a

  Copy full SHA for 659e89a

• notificationnnnnnnnnssssssssss

  JasperVanNiekerk

  committed
  4be2dfb

  Copy full SHA for 4be2dfb

• Merge pull request #192 from ST10204902/implementingInAppNotifictions

  Show description for 43e4bb5
  JasperVanNiekerk

  authored
  43e4bb5

  Copy full SHA for 43e4bb5

• removed the arrows from the background images for the shop doors

  

  ST10180919

  committed
  4f08819

  Copy full SHA for 4f08819

• item shop is done!!

  ST10195824

  committed
  262a006

  Copy full SHA for 262a006

• added extra notificationss

  JasperVanNiekerk

  committed
  71b65fb

  Copy full SHA for 71b65fb

• Create PRIVACY-POLICY.md

  JasperVanNiekerk

  authored
  e0410c2

  Copy full SHA for e0410c2

• Background shop is done!

  ST10195824

  committed
  ddb8378

  Copy full SHA for ddb8378

• Merge pull request #193 from ST10204902/backgroundShop

  Show description for a4b786d
  ST10195824

  authored
  a4b786d

  Copy full SHA for a4b786d

• Improved GradientEditText and GradientTextView drastically

  Show description for 3af6ee0
  

  ST10180919

  committed
  3af6ee0

  Copy full SHA for 3af6ee0

• Finalized UI on the ProfileSetupActivity

  Show description for cc6bbac
  

  ST10180919

  committed
  cc6bbac

  Copy full SHA for cc6bbac

• Update fragment_home.xml

  Show description for 2c151a3
  

  ST10180919

  committed
  2c151a3

  Copy full SHA for 2c151a3

• Update fragment_cat.xml

  Show description for aa242fc
  

  ST10180919

  committed
  aa242fc

  Copy full SHA for aa242fc

• Update component_milkcoins_amount.xml

  Show description for d104fbd
  

  ST10180919

  committed
  d104fbd

  Copy full SHA for d104fbd

• Update fragment_analysis.xml

  Show description for 45e4726
  

  ST10180919

  committed
  45e4726

  Copy full SHA for 45e4726

• removed the arrows from the background images for the shop doors

  

  ST10180919

  committed
  22c769e

  Copy full SHA for 22c769e

• Improved GradientEditText and GradientTextView drastically

  Show description for 153f75b
  

  ST10180919

  committed
  153f75b

  Copy full SHA for 153f75b

• Merge branch 'UI-fixes' of https://github.com/ST10204902/PurrsonalTrainer into UI-fixes

  

  ST10180919

  committed
  0311d03

  Copy full SHA for 0311d03

• Merge pull request #194 from ST10204902/UI-fixes

  Show description for fc0b3d9
  joshua-harvey

  authored
  fc0b3d9

  Copy full SHA for fc0b3d9

• updated strings for shops

  

  ST10180919

  committed
  6d7e897

  Copy full SHA for 6d7e897

• updated workout items

  Show description for 723743b
  

  ST10180919

  committed
  723743b

  Copy full SHA for 723743b

• Update fragment_routines.xml

  Show description for 52c851c
  

  ST10180919

  committed
  52c851c

  Copy full SHA for 52c851c

• updated routine play button

  

  ST10180919

  committed
  db51b7e

  Copy full SHA for db51b7e

• shop full finished and fixed an error where sets where checked as completed when starting a routine

  ST10195824

  committed
  8a956ca

  Copy full SHA for 8a956ca

• hot fix

  ST10195824

  committed
  2dd0714

  Copy full SHA for 2dd0714

• Merge pull request #195 from ST10204902/backgroundShop

  Show description for 23e49e0
  ST10195824

  authored
  23e49e0

  Copy full SHA for 23e49e0

• Update component_item_popup.xml

  

  ST10180919

  committed
  880cf1d

  Copy full SHA for 880cf1d

• Merge branch 'dev' of https://github.com/ST10204902/PurrsonalTrainer into dev

  

  ST10180919

  committed
  aa7511c

  Copy full SHA for aa7511c

• Hotfix milkcoins amount

  

  ST10180919

  committed
  500a847

  Copy full SHA for 500a847

• Added icon to display currently equipped item to cat fragment

  ST10204902

  committed
  89d4a1b

  Copy full SHA for 89d4a1b

• AAB and APK ready for distribution. Signed

  ST10204902

  committed
  2929eb0

  Copy full SHA for 2929eb0

• app is complete

  ST10195824

  committed
  f7cc9b3

  Copy full SHA for f7cc9b3

• new iconnnnnnnnnn

  JasperVanNiekerk

  committed
  01bb781

  Copy full SHA for 01bb781

• Merge branch 'dev' of https://github.com/ST10204902/PurrsonalTrainer into dev

  JasperVanNiekerk

  committed
  1326160

  Copy full SHA for 1326160

• Final update APK AAB

  ST10204902

  committed
  4f015f8

  Copy full SHA for 4f015f8