Added Multi-User and progress tracking functionality #18

harry6396 · 2019-06-03T05:49:52Z

Added multi-user support.
Added feature to track the progress of each user.

The attribute conflicts with another sharedUserId attribute in a different manifest file in the debug/release folder.

This reverts commit fd5926b.

This reverts commit 569ca00.

Very Minor changes

This reverts commit f2c112b.

…essTracker_Integration

…cker_Integration

… also made sliding_mages.xml responsive

kitkitschoollogger/kitkitlogger/src/main/java/com/maq/kitkitProvider/KitkitDBHandler.java

kitkitschoollogger/kitkitlogger/src/main/java/com/maq/kitkitProvider/User.java

ankitk20 · 2019-06-13T07:38:25Z

launcher/app/src/main/AndroidManifest.xml

    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />-->
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />


Take a merge from master and remove commented code wherever applicable

ankitk20 · 2019-06-14T10:48:55Z

launcher/app/build.gradle

@@ -76,6 +76,7 @@ dependencies {
        exclude group: 'com.android.support', module: 'support-annotations'
    })
    compile 'com.android.support:appcompat-v7:25.1.0'
+    compile 'de.hdodenhof:circleimageview:3.0.0'
    compile 'com.android.support:design:25.1.0'


Use api or implementation instead of compile

I tried but it's not able to find a file required in implementation mode

ankitk20 · 2019-06-14T10:49:49Z

launcher/app/src/main/AndroidManifest.xml

    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />-->
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    -->
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />


Check if this is required

It was there before, for wifi access and network access, might need it in future.

launcher/app/src/main/AndroidManifest.xml

launcher/app/src/main/java/com/maq/xprize/kitkitlauncher/hindi/SlidingPagerAdapter.java

ankitk20 · 2019-06-14T10:54:36Z

launcher/app/src/main/java/com/maq/xprize/kitkitlauncher/hindi/SlidingPagerAdapter.java

+
+    @Override
+    public boolean isViewFromObject(View view, Object object) {
+        return view == object;


== will always return false. Use equals()
https://www.geeksforgeeks.org/difference-equals-method-java/

I checked online, we should use == only here for equating.

ankitk20 · 2019-06-14T10:56:03Z

launcher/app/src/main/java/com/maq/xprize/kitkitlauncher/hindi/UserNameActivity.java

@@ -147,6 +147,17 @@ public void onSelectedNumber(int number) {
                {
                    KitkitDBHandler dbHandler = ((LauncherApplication) getApplication()).getDbHandler();
                    ArrayList<User> users = dbHandler.getUserList();
+                    try {
+                        schoolContext = getApplicationContext().createPackageContext("com.maq.xprize.kitkitschool.hindi", 0);


Use method to fetch package name instead of hardcoding

ankitk20 · 2019-06-14T11:00:05Z

launcher/app/src/main/res/layout/activity_multi_user.xml

+        android:layout_marginTop="40dp"
+        android:layout_marginBottom="8dp"
+        android:gravity="center"
+        android:text="Select User\nउपयोगकर्ता चयन"


Please use $#$ as delimiter instead of \n everywhere

\n is used for printing Hindi text in next line

ankitk20 · 2019-06-14T11:00:48Z

launcher/app/src/main/res/layout/activity_select_user.xml

+        android:background="@drawable/roundtextview"
+        android:fontFamily="Segoe UI"
+        android:gravity="center_horizontal"
+        android:text="Maths\\गणित"


Use $#$ instead of \ everywhere

Please can you explain me why to use $#$.

launcher/app/src/main/res/layout/activity_setting.xml

ankitk20 · 2019-06-14T11:04:05Z

mainapp/Classes/Managers/UserManager.cpp

+        gamesClearedInTotal++;
+        UserDefault::getInstance()->setIntegerForKey(gamesClearedInTotalKey.c_str(), gamesClearedInTotal);
+    }
+    ///////////////////////////////


Please comment properly. This code repo is public.

This reverts commit e6fca9b.

…layout.

…hub.com/maqsoftware/GLEXP-Team-KitkitSchool-Hindi into UserProfile_ProgressTracker_Integration

…gressTracker_Integration

…hub.com/maqsoftware/GLEXP-Team-KitkitSchool-Hindi into UserProfile_ProgressTracker_Integration

…ton in update UI

…tivity.

Add link to community

onetruffle and others added 30 commits May 29, 2019 12:56

Added gamesClearedInTotal to the UserDefault database

0d06f85

Added progress columns

e638e42

Granted mainapp resource permissions to the launcher

569ca00

Correction about sharedUserId

fd5926b

The attribute conflicts with another sharedUserId attribute in a different manifest file in the debug/release folder.

Add columns

da02526

Added coins to the table

ce423b8

Added progress variable to each user

ec329d0

Revert "Correction about sharedUserId"

795b032

This reverts commit fd5926b.

Revert "Granted mainapp resource permissions to the launcher"

651c195

This reverts commit 569ca00.

Minor changes

9be55d1

Changes

b48fa21

Changes

c505118

Changes

f2c112b

Very minor changes

70fadf1

Very Minor changes

Revert "Changes"

25f2183

This reverts commit f2c112b.

Minor Change

6fbad45

Fix sharedUserId for access

6373745

Added a column

c3d9ac8

Changes

2f75f9a

Minor changes

b1b0df4

Minor changes

699becd

Minor changes

0840358

Minor Changes

dca0685

Merge branch 'SanchitT/MultiUserFunctionality' into UserProfile_Progr…

ae715ad

…essTracker_Integration

.

21a057a

Merge branch 'SaitarunI/ProgressTracker' into UserProfile_ProgressTra…

dbf414f

…cker_Integration

Update strings.xml

8707fd8

Update User.java

2af22fb

Minor changes

4ec66c8

minor change

762dc09

onetruffle and others added 5 commits June 13, 2019 12:31

Merge branch 'newmaster' into SaitarunI/StaticCodeAnalysis_6_11

4224230

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

d627670

… also made sliding_mages.xml responsive

Resolve cpp issues of severity "style"

e64e4e2

Resolve cpp issues

bf04dc4

Fixed the UI and Edit User

69193b7

ankitk20 requested changes Jun 14, 2019

View reviewed changes

Prabhat Tyagi and others added 22 commits June 14, 2019 16:36

Updated the version and obb size

e6fca9b

Revert "Updated the version and obb size"

7bcc11a

This reverts commit e6fca9b.

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

60076f5

…layout.

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

f1de7e8

…hub.com/maqsoftware/GLEXP-Team-KitkitSchool-Hindi into UserProfile_ProgressTracker_Integration

Fixed Select User UI

b6fd90d

Merge branch 'SaitarunI/StaticCodeAnalysis_6_14' into UserProfile_Pro…

4a56e4c

…gressTracker_Integration

Resolved Comments

f90e596

Fixed the Back Button and User Image

da52e24

Fixed the usr image and button width in edit user

a897a79

Updated the logic to fetch the user details

4fe298e

UI chenges

5e86ab3

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

4e2f290

…hub.com/maqsoftware/GLEXP-Team-KitkitSchool-Hindi into UserProfile_ProgressTracker_Integration

Fixed Current User and Delete User and Add User method

0c818ff

Merge branch 'newmaster' into UserProfile_ProgressTracker_Integration

4aaa391

Merge branch 'newmaster' into UserProfile_ProgressTracker_Integration

9730142

Fixed the register button, Back Button and improved UI

d9d497d

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

c2c845f

…hub.com/maqsoftware/GLEXP-Team-KitkitSchool-Hindi into UserProfile_ProgressTracker_Integration

Merged with master

6e82c12

Removed unused methods and fixed the files

33803d0

Updated the files

47d3d67

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

e19a80c

…ton in update UI

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

efc542a

…tivity.

jeevithiesh pushed a commit that referenced this pull request Jul 5, 2019

Merge pull request #18 from XPRIZE/add-link-to-community

4ba2285

Add link to community

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added Multi-User and progress tracking functionality #18

Added Multi-User and progress tracking functionality #18

harry6396 commented Jun 3, 2019

ankitk20 Jun 13, 2019

ankitk20 Jun 14, 2019

SanchitTaliyan Jun 15, 2019

ankitk20 Jun 14, 2019

SanchitTaliyan Jun 15, 2019

ankitk20 Jun 14, 2019

SanchitTaliyan Jun 15, 2019

ankitk20 Jun 14, 2019

ankitk20 Jun 14, 2019

SanchitTaliyan Jun 15, 2019

ankitk20 Jun 14, 2019

SanchitTaliyan Jun 15, 2019

ankitk20 Jun 14, 2019

Added Multi-User and progress tracking functionality #18

Are you sure you want to change the base?

Added Multi-User and progress tracking functionality #18

Conversation

harry6396 commented Jun 3, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment