Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added Multi-User and progress tracking functionality #18

Open
wants to merge 108 commits into
base: newmaster
Choose a base branch
from
Open

Added Multi-User and progress tracking functionality #18

wants to merge 108 commits into from

Commits on May 29, 2019

  1. Added gamesClearedInTotal to the UserDefault database

    @onetruffle
    onetruffle committed May 29, 2019
    Configuration menu
    Copy the full SHA
    0d06f85 View commit details
    Browse the repository at this point in the history

  2. Added progress columns

    @onetruffle
    onetruffle committed May 29, 2019
    Configuration menu
    Copy the full SHA
    e638e42 View commit details
    Browse the repository at this point in the history

  3. Granted mainapp resource permissions to the launcher

    @onetruffle
    onetruffle committed May 29, 2019
    Configuration menu
    Copy the full SHA
    569ca00 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2019

  1. Correction about sharedUserId 

    The attribute conflicts with another sharedUserId attribute in a different manifest file in the debug/release folder.
    @onetruffle
    onetruffle committed May 30, 2019
    Configuration menu
    Copy the full SHA
    fd5926b View commit details
    Browse the repository at this point in the history

  2. Add columns

    @onetruffle
    onetruffle committed May 30, 2019
    Configuration menu
    Copy the full SHA
    da02526 View commit details
    Browse the repository at this point in the history

  3. Added coins to the table

    @onetruffle
    onetruffle committed May 30, 2019
    Configuration menu
    Copy the full SHA
    ce423b8 View commit details
    Browse the repository at this point in the history

  4. Added progress variable to each user

    @onetruffle
    onetruffle committed May 30, 2019
    Configuration menu
    Copy the full SHA
    ec329d0 View commit details
    Browse the repository at this point in the history

  5. Revert "Correction about sharedUserId" 

    This reverts commit fd5926b.
    @onetruffle
    onetruffle committed May 30, 2019
    Configuration menu
    Copy the full SHA
    795b032 View commit details
    Browse the repository at this point in the history

  6. Revert "Granted mainapp resource permissions to the launcher" 

    This reverts commit 569ca00.
    @onetruffle
    onetruffle committed May 30, 2019
    Configuration menu
    Copy the full SHA
    651c195 View commit details
    Browse the repository at this point in the history

  7. Minor changes

    @onetruffle
    onetruffle committed May 30, 2019
    Configuration menu
    Copy the full SHA
    9be55d1 View commit details
    Browse the repository at this point in the history

  8. Changes

    SanchitTaliyan committed May 30, 2019
    Configuration menu
    Copy the full SHA
    b48fa21 View commit details
    Browse the repository at this point in the history

  9. Changes

    SanchitTaliyan committed May 30, 2019
    Configuration menu
    Copy the full SHA
    c505118 View commit details
    Browse the repository at this point in the history

  10. Changes

    SanchitTaliyan committed May 30, 2019
    Configuration menu
    Copy the full SHA
    f2c112b View commit details
    Browse the repository at this point in the history

Commits on May 31, 2019

  1. Very minor changes 

    Very Minor changes
    SanchitTaliyan committed May 31, 2019
    Configuration menu
    Copy the full SHA
    70fadf1 View commit details
    Browse the repository at this point in the history

  2. Revert "Changes" 

    This reverts commit f2c112b.
    @onetruffle
    onetruffle committed May 31, 2019
    Configuration menu
    Copy the full SHA
    25f2183 View commit details
    Browse the repository at this point in the history

  3. Minor Change

    SanchitTaliyan committed May 31, 2019
    Configuration menu
    Copy the full SHA
    6fbad45 View commit details
    Browse the repository at this point in the history

  4. Fix sharedUserId for access

    @onetruffle
    onetruffle committed May 31, 2019
    Configuration menu
    Copy the full SHA
    6373745 View commit details
    Browse the repository at this point in the history

  5. Added a column

    @onetruffle
    onetruffle committed May 31, 2019
    Configuration menu
    Copy the full SHA
    c3d9ac8 View commit details
    Browse the repository at this point in the history

  6. Changes

    SanchitTaliyan committed May 31, 2019
    Configuration menu
    Copy the full SHA
    2f75f9a View commit details
    Browse the repository at this point in the history

  7. Minor changes

    SanchitTaliyan committed May 31, 2019
    Configuration menu
    Copy the full SHA
    b1b0df4 View commit details
    Browse the repository at this point in the history

  8. Minor changes

    SanchitTaliyan committed May 31, 2019
    Configuration menu
    Copy the full SHA
    699becd View commit details
    Browse the repository at this point in the history

  9. Minor changes

    SanchitTaliyan committed May 31, 2019
    Configuration menu
    Copy the full SHA
    0840358 View commit details
    Browse the repository at this point in the history

  10. Minor Changes

    SanchitTaliyan committed May 31, 2019
    Configuration menu
    Copy the full SHA
    dca0685 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'SanchitT/MultiUserFunctionality' into UserProfile_Progr… 

    …essTracker_Integration
    @onetruffle
    onetruffle committed May 31, 2019
    Configuration menu
    Copy the full SHA
    ae715ad View commit details
    Browse the repository at this point in the history

  12. .

    @onetruffle
    onetruffle committed May 31, 2019
    Configuration menu
    Copy the full SHA
    21a057a View commit details
    Browse the repository at this point in the history

  13. Merge branch 'SaitarunI/ProgressTracker' into UserProfile_ProgressTra… 

    …cker_Integration
    @onetruffle
    onetruffle committed May 31, 2019
    Configuration menu
    Copy the full SHA
    dbf414f View commit details
    Browse the repository at this point in the history

  14. Update strings.xml

    @onetruffle
    onetruffle committed May 31, 2019
    Configuration menu
    Copy the full SHA
    8707fd8 View commit details
    Browse the repository at this point in the history

  15. Update User.java

    @onetruffle
    onetruffle committed May 31, 2019
    Configuration menu
    Copy the full SHA
    2af22fb View commit details
    Browse the repository at this point in the history

  16. Minor changes

    SanchitTaliyan committed May 31, 2019
    Configuration menu
    Copy the full SHA
    4ec66c8 View commit details
    Browse the repository at this point in the history

  17. minor change

    SanchitTaliyan committed May 31, 2019
    Configuration menu
    Copy the full SHA
    762dc09 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2019

  1. Update FirstScreen.java

    SanchitTaliyan committed Jun 1, 2019
    Configuration menu
    Copy the full SHA
    1b56336 View commit details
    Browse the repository at this point in the history

  2. Changes

    SanchitTaliyan committed Jun 1, 2019
    Configuration menu
    Copy the full SHA
    3566ec0 View commit details
    Browse the repository at this point in the history

  3. Update build.gradle

    SanchitTaliyan committed Jun 1, 2019
    Configuration menu
    Copy the full SHA
    5ebff1b View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2019

  1. Update FirstScreen.java

    SanchitTaliyan committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    a4b18bb View commit details
    Browse the repository at this point in the history

  2. Update UserNameListDialog.java

    @onetruffle
    onetruffle committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    62e80ae View commit details
    Browse the repository at this point in the history

  3. Merge branch 'UserProfile_ProgressTracker_Integration' of https://git… 

    …hub.com/maqsoftware/GLEXP-Team-KitkitSchool-Hindi into UserProfile_ProgressTracker_Integration
    @onetruffle
    onetruffle committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    9b74978 View commit details
    Browse the repository at this point in the history

  4. Revert "Update build.gradle" 

    This reverts commit 5ebff1b.
    Prabhat Tyagi committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    fb93084 View commit details
    Browse the repository at this point in the history

  5. Revert "Changes" 

    This reverts commit 3566ec0.
    Prabhat Tyagi committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    e3dacb5 View commit details
    Browse the repository at this point in the history

  6. Reverted the changes of gradle files

    Prabhat Tyagi committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    e50d99b View commit details
    Browse the repository at this point in the history

  7. Updated the file name and removed unused code

    Prabhat Tyagi committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    d20e3e1 View commit details
    Browse the repository at this point in the history

  8. Update MultiUserActivity.java

    SanchitTaliyan committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    b8dc0e6 View commit details
    Browse the repository at this point in the history

  9. Update MultiUserActivity.java

    SanchitTaliyan committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    e866205 View commit details
    Browse the repository at this point in the history

  10. Update MultiUserActivity.java

    SanchitTaliyan committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    2b0f25c View commit details
    Browse the repository at this point in the history

  11. Updated the UI of adding the user and removed unsued code

    Prabhat Tyagi committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    d4916a3 View commit details
    Browse the repository at this point in the history

  12. Removed the unused variables

    Prabhat Tyagi committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    76a31e5 View commit details
    Browse the repository at this point in the history

  13. Update MultiUserActivity.java

    SanchitTaliyan committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    78138e9 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2019

  1. Update in Manifest and multi_user layout

    SanchitTaliyan committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    4f5933a View commit details
    Browse the repository at this point in the history

  2. Removed unused code

    SanchitTaliyan committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    d588e9d View commit details
    Browse the repository at this point in the history

  3. Updated the shared user id

    SanchitTaliyan committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    15e4826 View commit details
    Browse the repository at this point in the history

  4. Updated the shared user id of launcher release app

    SanchitTaliyan committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    b107eac View commit details
    Browse the repository at this point in the history

  5. Merge branch 'newmaster' into UserProfile_ProgressTracker_Integration

    Prabhat Tyagi committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    7ef828a View commit details
    Browse the repository at this point in the history

  6. Fixed the issue of coins

    SanchitTaliyan committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    2572b21 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'UserProfile_ProgressTracker_Integration' of https://git… 

    …hub.com/maqsoftware/GLEXP-Team-KitkitSchool-Hindi into UserProfile_ProgressTracker_Integration
    SanchitTaliyan committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    08aa7a6 View commit details
    Browse the repository at this point in the history

  8. Updated the SharedUserId, fixed the SetUser function, updated the lau… 

    …ncher layout
    SanchitTaliyan committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    0233c30 View commit details
    Browse the repository at this point in the history

  9. Changed the sharedUserId in release Android Manifest

    SanchitTaliyan committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    e1cecf3 View commit details
    Browse the repository at this point in the history

  10. Resolved issues of severity "error" and "portability"

    @onetruffle
    onetruffle committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    365dfef View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2019

  1. Resolve issues of severity "performance"

    @onetruffle
    onetruffle committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    c058f20 View commit details
    Browse the repository at this point in the history

  2. Resolve more issues of severity "performance"

    @onetruffle
    onetruffle committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    e4d24cb View commit details
    Browse the repository at this point in the history

  3. Resolve more issues of severity "performance"

    @onetruffle
    onetruffle committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    4833052 View commit details
    Browse the repository at this point in the history

  4. Changed the add and select buttons image in activity_multi_user

    SanchitTaliyan committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    005be84 View commit details
    Browse the repository at this point in the history

  5. fixes

    @onetruffle
    onetruffle committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    b2963fc View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2019

  1. Resolve more issures of severity "performance"

    @onetruffle
    onetruffle committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    56e671a View commit details
    Browse the repository at this point in the history

  2. Changes in Add and Select user UI

    SanchitTaliyan committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    71ee474 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'newmaster' into UserProfile_ProgressTracker_Integration

    Prabhat Tyagi committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    6463153 View commit details
    Browse the repository at this point in the history

  4. Resolved issues of severity "warning"

    @onetruffle
    onetruffle committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    6fda6d3 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2019

  1. Updated the Add and Select User layout

    SanchitTaliyan committed Jun 7, 2019
    Configuration menu
    Copy the full SHA
    5f04b9e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'UserProfile_ProgressTracker_Integration' of https://git… 

    …hub.com/maqsoftware/GLEXP-Team-KitkitSchool-Hindi into UserProfile_ProgressTracker_Integration
    SanchitTaliyan committed Jun 7, 2019
    Configuration menu
    Copy the full SHA
    343b6af View commit details
    Browse the repository at this point in the history

  3. Updated the layout of add user

    SanchitTaliyan committed Jun 7, 2019
    Configuration menu
    Copy the full SHA
    e78f16f View commit details
    Browse the repository at this point in the history

  4. Fixed the layout for all devices

    SanchitTaliyan committed Jun 7, 2019
    Configuration menu
    Copy the full SHA
    69e4cbd View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2019

  1. Add User functionality and Select User UI progress

    SanchitTaliyan committed Jun 8, 2019
    Configuration menu
    Copy the full SHA
    b218bbd View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2019

  1. Added Select User Functionality

    SanchitTaliyan committed Jun 11, 2019
    Configuration menu
    Copy the full SHA
    0406c45 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2019

  1. Updated Select User and Main Activity 

    In Select User added set current user and in Main Activity added the functionality to call Select User when clicked on user name.
    SanchitTaliyan committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    d17f928 View commit details
    Browse the repository at this point in the history

  2. Updated Add User 

    After clicking picture picture will replace the button
    SanchitTaliyan committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    d0e53dd View commit details
    Browse the repository at this point in the history

  3. Resolve lint errors

    @onetruffle
    onetruffle committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    c8a4333 View commit details
    Browse the repository at this point in the history

  4. Severity "error"

    @onetruffle
    onetruffle committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    3448658 View commit details
    Browse the repository at this point in the history

  5. Updated the code to redirect the user to the multi-user activity

    Prabhat Tyagi committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    f48aa97 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2019

  1. Added code to fetch the current page

    Prabhat Tyagi committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    c3ad95a View commit details
    Browse the repository at this point in the history

  2. Update MultiUserActivity.java

    SanchitTaliyan committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    83d36d8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'UserProfile_ProgressTracker_Integration' of https://git… 

    …hub.com/maqsoftware/GLEXP-Team-KitkitSchool-Hindi into UserProfile_ProgressTracker_Integration
    SanchitTaliyan committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    22c0c49 View commit details
    Browse the repository at this point in the history

  4. Added Edit User fuctionality and cleaned the code

    SanchitTaliyan committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    ba5860a View commit details
    Browse the repository at this point in the history

  5. Revert "Severity "error"" 

    This reverts commit 3448658.
    @onetruffle
    onetruffle committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    a806b11 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'newmaster' into SaitarunI/StaticCodeAnalysis_6_11

    @onetruffle
    onetruffle committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    4224230 View commit details
    Browse the repository at this point in the history

  7. Made Image to appear in circle and made multi_user.sml responsive and… 

    … also made sliding_mages.xml responsive
    SanchitTaliyan committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    d627670 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2019

  1. Resolve cpp issues of severity "style"

    @onetruffle
    onetruffle committed Jun 14, 2019
    Configuration menu
    Copy the full SHA
    e64e4e2 View commit details
    Browse the repository at this point in the history

  2. Resolve cpp issues

    @onetruffle
    onetruffle committed Jun 14, 2019
    Configuration menu
    Copy the full SHA
    bf04dc4 View commit details
    Browse the repository at this point in the history

  3. Fixed the UI and Edit User

    SanchitTaliyan committed Jun 14, 2019
    Configuration menu
    Copy the full SHA
    69193b7 View commit details
    Browse the repository at this point in the history

  4. Updated the version and obb size

    Prabhat Tyagi committed Jun 14, 2019
    Configuration menu
    Copy the full SHA
    e6fca9b View commit details
    Browse the repository at this point in the history

  5. Revert "Updated the version and obb size" 

    This reverts commit e6fca9b.
    Prabhat Tyagi committed Jun 14, 2019
    Configuration menu
    Copy the full SHA
    7bcc11a View commit details
    Browse the repository at this point in the history

  6. Fixed Minimum user age and Back button UI and English,Maths progress … 

    …layout.
    SanchitTaliyan committed Jun 14, 2019
    Configuration menu
    Copy the full SHA
    60076f5 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'UserProfile_ProgressTracker_Integration' of https://git… 

    …hub.com/maqsoftware/GLEXP-Team-KitkitSchool-Hindi into UserProfile_ProgressTracker_Integration
    SanchitTaliyan committed Jun 14, 2019
    Configuration menu
    Copy the full SHA
    f1de7e8 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2019

  1. Fixed Select User UI

    SanchitTaliyan committed Jun 15, 2019
    Configuration menu
    Copy the full SHA
    b6fd90d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'SaitarunI/StaticCodeAnalysis_6_14' into UserProfile_Pro… 

    …gressTracker_Integration
    @onetruffle
    onetruffle committed Jun 15, 2019
    Configuration menu
    Copy the full SHA
    4a56e4c View commit details
    Browse the repository at this point in the history

  3. Resolved Comments

    SanchitTaliyan committed Jun 15, 2019
    Configuration menu
    Copy the full SHA
    f90e596 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2019

  1. Fixed the Back Button and User Image

    SanchitTaliyan committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    da52e24 View commit details
    Browse the repository at this point in the history

  2. Fixed the usr image and button width in edit user

    SanchitTaliyan committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    a897a79 View commit details
    Browse the repository at this point in the history

  3. Updated the logic to fetch the user details

    Prabhat Tyagi committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    4fe298e View commit details
    Browse the repository at this point in the history

  4. UI chenges

    SanchitTaliyan committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    5e86ab3 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'UserProfile_ProgressTracker_Integration' of https://git… 

    …hub.com/maqsoftware/GLEXP-Team-KitkitSchool-Hindi into UserProfile_ProgressTracker_Integration
    SanchitTaliyan committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    4e2f290 View commit details
    Browse the repository at this point in the history

  6. Fixed Current User and Delete User and Add User method

    SanchitTaliyan committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    0c818ff View commit details
    Browse the repository at this point in the history

  7. Merge branch 'newmaster' into UserProfile_ProgressTracker_Integration

    Prabhat Tyagi committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    4aaa391 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'newmaster' into UserProfile_ProgressTracker_Integration

    Prabhat Tyagi committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    9730142 View commit details
    Browse the repository at this point in the history

  9. Fixed the register button, Back Button and improved UI

    SanchitTaliyan committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    d9d497d View commit details
    Browse the repository at this point in the history

  10. Merge branch 'UserProfile_ProgressTracker_Integration' of https://git… 

    …hub.com/maqsoftware/GLEXP-Team-KitkitSchool-Hindi into UserProfile_ProgressTracker_Integration
    SanchitTaliyan committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    c2c845f View commit details
    Browse the repository at this point in the history

  11. Merged with master

    SanchitTaliyan committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    6e82c12 View commit details
    Browse the repository at this point in the history

  12. Removed unused methods and fixed the files

    Prabhat Tyagi committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    33803d0 View commit details
    Browse the repository at this point in the history

  13. Updated the files

    Prabhat Tyagi committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    47d3d67 View commit details
    Browse the repository at this point in the history

  14. Removed Display Name, Fixed the Launcher first screen, added back but… 

    …ton in update UI
    SanchitTaliyan committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    e19a80c View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2019

  1. Added previus and next image button. Also fixed user image in main ac… 

    …tivity.
    SanchitTaliyan committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    efc542a View commit details
    Browse the repository at this point in the history