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

BW-877 Do changes while making release of 2.0 #704

Open
wants to merge 6 commits into
base: part-32
Choose a base branch
from
+38 −27
Open

BW-877 Do changes while making release of 2.0 #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fa21aae
fixed phone login issue
jitendraP-ashutec Sep 16, 2020
27acbf1
Changed in infoplist file
jitendraP-ashutec Sep 29, 2020
44dabfa
fixed accounts info not displyed on game profile
jitendraP-ashutec Sep 29, 2020
406eba2
change app in info.plist
jitendraP-ashutec Sep 30, 2020
72344b8
score is not displayed when score is 0
jitendraP-ashutec Sep 30, 2020
ac9dc2d
added include tests file
jitendraashutec Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions App_Resources/iOS/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,14 @@
<array>
<string>remote-notification</string>
</array>
<key>NSPhotoLibraryUsageDescription</key>
<string>Please allow gallery access</string>
<key>NSLocationUsageDescription</key>
<string>App would like to access your location to offer you suggestion for current location</string>
<string>bitWiser would like to access your location to offer you suggestion for current location</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>App would like to access your location to offer you suggestion for current location</string>
<string>bitWiser would like to access your location to offer you suggestion for current location</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>bitWiser would like to access your photo library, This will allow you to select your photo as profile picture</string>
<key>NSCameraUsageDescription</key>
<string>bitWiser would like to access your camera, This will allow you to take photo for profile picture</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
</dict>
Expand Down
10 changes: 6 additions & 4 deletions configurations/bitwiser-edu/ios/Info.plist.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,13 @@
<array>
<string>remote-notification</string>
</array>
<key>NSPhotoLibraryUsageDescription</key>
<string>Please allow gallery access</string>
<key>NSLocationUsageDescription</key>
<string>App would like to access your location to offer you suggestion for current location</string>
<string>bitWiser edu would like to access your location to offer you suggestion for current location</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>App would like to access your location to offer you suggestion for current location</string>
<string>bitWiser edu would like to access your location to offer you suggestion for current location</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>bitWiser edu would like to access your photo library, This will allow you to select your photo as profile picture</string>
<key>NSCameraUsageDescription</key>
<string>bitWiser edu would like to access your camera, This will allow you to take photo for profile picture</string>
</dict>
</plist>
10 changes: 6 additions & 4 deletions configurations/bitwiser-edu/ios/Info.plist.prod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,13 @@
<array>
<string>remote-notification</string>
</array>
<key>NSPhotoLibraryUsageDescription</key>
<string>Please allow gallery access</string>
<key>NSLocationUsageDescription</key>
<string>App would like to access your location to offer you suggestion for current location</string>
<string>bitWiser edu would like to access your location to offer you suggestion for current location</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>App would like to access your location to offer you suggestion for current location</string>
<string>bitWiser edu would like to access your location to offer you suggestion for current location</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>bitWiser edu would like to access your photo library, This will allow you to select your photo as profile picture</string>
<key>NSCameraUsageDescription</key>
<string>bitWiser edu would like to access your camera, This will allow you to take photo for profile picture</string>
</dict>
</plist>
10 changes: 6 additions & 4 deletions configurations/trivia/ios/Info.plist.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,14 @@
<array>
<string>remote-notification</string>
</array>
<key>NSPhotoLibraryUsageDescription</key>
<string>Please allow gallery access</string>
<key>NSLocationUsageDescription</key>
<string>App would like to access your location to offer you suggestion for current location</string>
<string>bitWiser would like to access your location to offer you suggestion for current location</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>App would like to access your location to offer you suggestion for current location</string>
<string>bitWiser would like to access your location to offer you suggestion for current location</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>bitWiser would like to access your photo library, This will allow you to select your photo as profile picture</string>
<key>NSCameraUsageDescription</key>
<string>bitWiser would like to access your camera, This will allow you to take photo for profile picture</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
</dict>
Expand Down
10 changes: 6 additions & 4 deletions configurations/trivia/ios/Info.plist.prod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,14 @@
<array>
<string>remote-notification</string>
</array>
<key>NSPhotoLibraryUsageDescription</key>
<string>Please allow gallery access</string>
<key>NSLocationUsageDescription</key>
<string>App would like to access your location to offer you suggestion for current location</string>
<string>bitWiser would like to access your location to offer you suggestion for current location</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>App would like to access your location to offer you suggestion for current location</string>
<string>bitWiser would like to access your location to offer you suggestion for current location</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>bitWiser would like to access your photo library, This allows you to select your photo as profile picture</string>
<key>NSCameraUsageDescription</key>
<string>bitWiser would like to access your camera, This allows you to take photo for profile picture</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion projects/shared-library/src/lib/core/components/login/login.component.tns.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<GridLayout *ngIf="mode === 0" row="2"  col="0" rows="*" columns="auto,auto,auto,auto,auto" class="logo-section">
               <Image col="1" src="res://fblogo" stlRippleEffect (rippleTap)="fbLogin()"> </Image>
           <Image col="2"  src="res://googlelogo" stlRippleEffect (rippleTap)="googleLogin()"></Image>
               <Image col="3" src="res://callicon" class="phone-icon" stlRippleEffect (rippleTap)="phoneSignIn()"> </Image>            
               <Image col="3" src="res://callicon" class="phone-icon" stlRippleEffect (rippleTap)="setPhoneSignIn()"> </Image>            
<Image col="4" src="res://applelogo" class="phone-icon" stlRippleEffect (rippleTap)="appleSignIn()"></Image>


Expand Down
2 changes: 1 addition & 1 deletion projects/trivia/src/app/game-play/components/game-continue/game-continue.component.tns.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
class="score-container">
<Image src="res://bits"></Image>
<Label class="score-text"
[text]="game?.stats[user.userId]?.score * (applicationSettings?.tokens?.earn_bits ? applicationSettings?.tokens?.earn_bits : 0)"
text="{{game?.stats[user.userId]?.score * (applicationSettings?.tokens?.earn_bits ? applicationSettings?.tokens?.earn_bits : 0)}}"
textWrap="true"></Label>
</FlexboxLayout>
<Button *ngIf="!turnFlag && !threeConsecutiveAnswer" android:elevation="20" ios:elevation="20" android:paddingTop="15" ios:paddingTop="10"
Expand Down
10 changes: 5 additions & 5 deletions projects/trivia/src/app/user/components/game-profile/game-profile.component.tns.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,31 +112,31 @@
<FlexboxLayout flexWrap="wrap" margin="0 10 20 10" horizontalAlignment="center">
<FlexboxLayout class="stats-box" margin="0 10 10 0">
<FlexboxLayout alignSelf="center" flexDirection="column" alignItems="flex-start">
<Label [text]="account?.gamePlayed || 0" class="bold-text text-color" textWrap="true"></Label>
<Label text="{{account?.gamePlayed || 0}}" class="bold-text text-color" textWrap="true"></Label>
<Label text="Played" class="text-black" fontSize="15" textWrap="true"></Label>
</FlexboxLayout>
</FlexboxLayout>
<FlexboxLayout class="stats-box" margin="0 10 10 0">
<FlexboxLayout alignSelf="center" flexDirection="column">
<Label [text]="account?.wins || 0" class="bold-text text-color" textWrap="true"></Label>
<Label text="{{account?.wins || 0}}" class="bold-text text-color" textWrap="true"></Label>
<Label text="Won" class="text-black" fontSize="15" textWrap="true"></Label>
</FlexboxLayout>
</FlexboxLayout>
<FlexboxLayout class="stats-box" marginBottom="10">
<FlexboxLayout alignSelf="center" flexDirection="column">
<Label [text]="account?.badges || 0" class="bold-text text-color" textWrap="true"></Label>
<Label text="{{account?.badges || 0}}" class="bold-text text-color" textWrap="true"></Label>
<Label text="Badges" class="text-black" fontSize="15" textWrap="true"></Label>
</FlexboxLayout>
</FlexboxLayout>
<FlexboxLayout class="stats-box" marginRight="10">
<FlexboxLayout alignSelf="center" flexDirection="column">
<Label [text]="account?.categories || 0" class="bold-text text-color" textWrap="true"></Label>
<Label text="{{account?.categories || 0}}" class="bold-text text-color" textWrap="true"></Label>
<Label text="Categories" class="text-black" fontSize="15" textWrap="true"></Label>
</FlexboxLayout>
</FlexboxLayout>
<FlexboxLayout class="stats-box" marginRight="10">
<FlexboxLayout alignSelf="center" flexDirection="column">
<Label [text]="user?.totalFriends || 0" class="bold-text text-color" textWrap="true"></Label>
<Label text="{{user?.totalFriends || 0}}" class="bold-text text-color" textWrap="true"></Label>
<Label text="Friends" class="text-black" fontSize="15" textWrap="true"></Label>
</FlexboxLayout>
</FlexboxLayout>
Expand Down
1 change: 1 addition & 0 deletions projects/trivia/src/app/user/components/game-profile/game-profile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ export class GameProfile {
this.topics = [];
this.user = userDict[this.userId];
this.account = this.user.account;
this.cd.markForCheck();
this.gamePlayedAgainst = this.user.gamePlayed;
if (this.gamePlayedAgainst && this.loggedInUser && this.loggedInUser.userId && this.userType === 1) {
this.gamePlayedChangeSubject.next(true);
Expand Down