Skip to content
Jump to bottom

Generator feature #10

Merged
merged 20 commits into from Dec 3, 2020
Merged

Generator feature #10

merged 20 commits into from Dec 3, 2020
+1,166 −297

Commits on Nov 25, 2020

  1. updating textfields and workouts added

    varun committed Nov 25, 2020
    7e65eeb

  2. testing

    varun committed Nov 25, 2020
    9b84e7d

  3. testing generator branch

    varun committed Nov 25, 2020
    1e77ba6

  4. final test (version control)

    varun committed Nov 25, 2020
    f2dd407

  5. Merge remote-tracking branch 'refs/remotes/origin/generatorFeature' 

    Conflicts:
	FitnessApp/ViewControllers/GeneratorDisplay.swift
    varun committed Nov 25, 2020
    b480995

  6. logic completed

    varun committed Nov 25, 2020
    4c7c436

  7. testing

    varun committed Nov 25, 2020
    447769c

  8. added comments to the code

    varun committed Nov 25, 2020
    18e6717

  9. added more comments

    varun committed Nov 25, 2020
    83d6e91

  10. linked the two view controllers of the calculate feature

    varun committed Nov 25, 2020
    a73139d

Commits on Nov 26, 2020

  1. Connected the UI objects onto code 

    no build error
    varun committed Nov 26, 2020
    0940f6b

  2. cleaned up the display by making changes to sizing of objects the the UI

    varun committed Nov 26, 2020
    f78cc58

  3. Logic on calculator feature completed 

    no build error
    varun committed Nov 26, 2020
    a47e6ab

Commits on Nov 30, 2020

  1. added a more dynamic logic to make the feature better

    varun committed Nov 30, 2020
    f20962a

Commits on Dec 1, 2020

  1. cleaned up the user interface with newly assigned constraints for the… 

    … ui objects

no build time error or bugs
    varun committed Dec 1, 2020
    5b09ed7

  2. calorie section cleaned up with new constraints for the ui objects 

    no build error or bugs
deleted username as it was not necessary
    varun committed Dec 1, 2020
    a8e2764

  3. changed the constraints of the 'calculate' button

    varun committed Dec 1, 2020
    8c5560a

Commits on Dec 2, 2020

  1. made some design changes

    varun committed Dec 2, 2020
    f9ffa8d

Commits on Dec 3, 2020

  1. fixed some spelling issue

    varun committed Dec 3, 2020
    76231b8

  2. changed the logic to make the data more accurate( more accurate calor… 

    …ie count for the exercises)
    varun committed Dec 3, 2020
    a8cd10a