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

Upgrade to .NET MAUI #406

Draft
wants to merge 145 commits into
base: main
Choose a base branch
from
+50,506 −12,987
Draft

Upgrade to .NET MAUI #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
145 commits
Select commit Hold shift + click to select a range
c04db70
🚧 Migrating to .NET MAUI!
JackDevAU Dec 14, 2022
d7374f9
♻️ Refactor FlyoutHeader - Move inside AppShell
JackDevAU Dec 14, 2022
3e1c465
🚧 Updated Namespaces
JackDevAU Dec 15, 2022
4117c73
🚧Started moving Resources
JackDevAU Dec 15, 2022
b20b94c
Updated foint and image resources
matt-goldman Dec 15, 2022
f295d4b
Refactoring to allow LoginPage without App resource dict
matt-goldman Dec 15, 2022
1972998
Got Auth working - Added WebCallbackActivity
JackDevAU Dec 15, 2022
14f05d5
Fixed Resources issue using TryGetValue
JackDevAU Dec 15, 2022
a892542
Add Android Permissions for camera
JackDevAU Dec 16, 2022
00d84e6
Added file properties in user service
matt-goldman Dec 16, 2022
3bb9ae1
Tweaked login page
matt-goldman Jan 7, 2023
45e7419
Reverted to SkiaSharp progress bar due to bugs in Maui.Graphics. Note…
matt-goldman Jan 7, 2023
fe5dd11
fixed achievement grid
matt-goldman Jan 7, 2023
dbc1bb6
Fix profile carousel layouts, started improving snack bar.
matt-goldman Jan 7, 2023
01267f0
Fix profile carousel layouts, started improving snack bar.
matt-goldman Jan 7, 2023
f9edc16
merge commit
matt-goldman Jan 7, 2023
95d37eb
Added profile page constructor to allow navigation from leaderboard
matt-goldman Jan 7, 2023
4b2ef72
Profile pictures working
matt-goldman Jan 11, 2023
700aa19
Fixed search box on leaderboard
matt-goldman Jan 12, 2023
114e8ec
Fixed scrolling buttons on leaderboard
matt-goldman Jan 12, 2023
746a0c7
Added workaround for filtering on leaderboard
matt-goldman Jan 12, 2023
31ab637
Fixed people page
matt-goldman Jan 12, 2023
8eec391
Updated snackbar and popup pages
matt-goldman Jan 13, 2023
0a1bde7
Added leaderboard tabs workaround
matt-goldman Jan 13, 2023
0527ae3
Started fixing flyout header
matt-goldman Jan 13, 2023
cd68b4d
Updated viewmodel namespaces, fixed flyout header
matt-goldman Feb 3, 2023
5e89c6f
Fixed flyout header layout
matt-goldman Feb 3, 2023
8be6f83
replace MessagingCenter with WeakReferenceMessenger
AntPolkanov Feb 3, 2023
e2d5b91
Fixed snack bar for own profile
matt-goldman Feb 3, 2023
d7d9bd8
Merge branch 'upgrade-to-maui-v2' of https://github.com/SSWConsulting…
matt-goldman Feb 3, 2023
478146a
delete SocialUsernameMessage as it was replaced by SocialUsernameAdde…
Anton-Polkanov Feb 3, 2023
57fb7bf
Started integrating MessagingCenter -> WeakReferenceMessenger
matt-goldman Feb 3, 2023
b208676
Merge branch 'upgrade-to-maui-v2' of https://github.com/SSWConsulting…
matt-goldman Feb 3, 2023
b1ca9ef
fix android target
AntPolkanov Feb 4, 2023
9a8751e
apply xaml compilation to the entire assembly
AntPolkanov Feb 6, 2023
ec45f24
TextCursorDrawable call crashes the app on API < 29; use accentColor …
AntPolkanov Feb 6, 2023
cb3de0b
fix status bar, navigation bar and splash screen
AntPolkanov Feb 7, 2023
ea22abf
fixed app icon
AntPolkanov Feb 7, 2023
9c2ccc7
use AppCenter conditionally
AntPolkanov Feb 9, 2023
d289b53
fixed Achievement label clash
AntPolkanov Feb 9, 2023
00fac4b
fixed corner radiuses for circular shapes
AntPolkanov Feb 9, 2023
a9d2757
add spacing to maui stack layouts
AntPolkanov Feb 9, 2023
4a32629
fixed icon switch bug for the Search
AntPolkanov Feb 10, 2023
6feee0f
fix margins and paddings for multiple pages
AntPolkanov Feb 10, 2023
a0b044c
fix margings and paddings for PeoplePage
AntPolkanov Feb 10, 2023
acaba64
display camera preview full screen
AntPolkanov Feb 10, 2023
532145f
disable automatic status bar color inferring for iOS
AntPolkanov Feb 16, 2023
321fe50
fixed home indicator background color for iOS
AntPolkanov Feb 16, 2023
0ab53bb
fixed CameraPage
AntPolkanov Feb 16, 2023
0dd52ba
use only black theme colors in Styles
AntPolkanov Feb 17, 2023
293266d
fixed balance cropping on profile page
AntPolkanov Feb 17, 2023
d82789b
fixed snackbar layout for narrow devices
AntPolkanov Feb 17, 2023
1480de4
enable camera on iOS
AntPolkanov Feb 20, 2023
da43258
use workaround on Android for the BarcodeReader
AntPolkanov Feb 20, 2023
b904ebf
display labels on top of camera preview
AntPolkanov Feb 20, 2023
f65b0ab
carousel almost working except animation on iOS
AntPolkanov Feb 20, 2023
017a0cb
portrait orientation only
AntPolkanov Feb 20, 2023
cfff5e0
ScanResult page is working but without animations
AntPolkanov Feb 21, 2023
2f8949c
add converter to SkLottieImageSource
AntPolkanov Feb 22, 2023
957e35c
update Mopups to fix not working CloseWhenBackgroundClicked on iOS
AntPolkanov Feb 22, 2023
f535560
set width for external icon so that it is displayed correctly on iOS
AntPolkanov Feb 22, 2023
7105019
display Join Us menu item on the FlyoutPage
AntPolkanov Feb 22, 2023
6966af6
fix FlyoutPage layout
AntPolkanov Feb 22, 2023
7a2ee0e
manually set tab icon colors on iOS
AntPolkanov Feb 23, 2023
c3af88a
replace icon_menu with a smaller image
Mar 7, 2023
7ba94d0
clean up csproj
Mar 7, 2023
c2a4aa8
fix blurry icons except tab icons
Mar 7, 2023
193683a
fixed corner radius on iOS
Mar 8, 2023
6273f14
fixed grey skill bards on PeoplePage
Mar 8, 2023
522e9c2
fixed developer description screen overflow on iOS
Mar 8, 2023
f163120
fixed splash screen
Mar 8, 2023
a767ddc
fixed app icon
Mar 9, 2023
4aea188
SkLottieView workaround
AntPolkanov Mar 9, 2023
9c41d7b
fix popups on Android
AntPolkanov Mar 9, 2023
200d447
replace ImageButton with Border and Label
AntPolkanov Mar 10, 2023
a0b956e
fixed camera page
AntPolkanov Mar 10, 2023
0062635
extract ProfileStats component
AntPolkanov Mar 10, 2023
502aee4
change layout of ProfileStats to fix various issues
AntPolkanov Mar 10, 2023
7a1c8cd
fixed slow collection view
AntPolkanov Mar 10, 2023
c71bd4a
fixed star icon missing for some items in the All Time leaders list
AntPolkanov Mar 10, 2023
273916b
fixed images not displaying correctly on the PeoplePage
AntPolkanov Mar 14, 2023
47f60a9
improved Leaderboard list performance and fixed multiple issues with …
AntPolkanov Mar 15, 2023
6fb28fc
remove ssw logo from a native layer
AntPolkanov Mar 20, 2023
2150937
Bumped Android version
matt-goldman Mar 29, 2023
bb2d971
Added iOS padding to skills bars
matt-goldman May 12, 2023
5dee2fe
Fixed performance on leaderboard sorting (avg ~3300ms -> ~15ms)
matt-goldman May 12, 2023
fb044db
Refactoring to resolve tab issues on iOS
matt-goldman May 14, 2023
1db45a2
Tabs now working on iOS
matt-goldman May 15, 2023
968b5b3
Fixed cropped icon on iOS
matt-goldman May 15, 2023
d1ac231
Tabs working with SVG files
matt-goldman May 15, 2023
af5bcab
Final workaround for tab icons
matt-goldman May 15, 2023
25f042a
add username example
AntPolkanov Jul 12, 2023
ba03843
✨Add employee search feature (#430)
AntPolkanov Jul 17, 2023
0c9ce78
manually merge ✨Add employee search feature
AntPolkanov Jul 18, 2023
31402b6
manually merge ✨Add username example
AntPolkanov Jul 18, 2023
4cd56da
uncomment message
AntPolkanov Jul 18, 2023
f37594e
upgrade to .NET 8.0.100-preview.6.23330.14
AntPolkanov Jul 19, 2023
481e97d
fix height for RecentActivity and Notifications
AntPolkanov Jul 19, 2023
3986733
marshall QR-code callback on the main thread
AntPolkanov Jul 19, 2023
cc9d18f
use TryGetValue for resourses
AntPolkanov Jul 19, 2023
0064f4f
fix issue when ScanResult popup is dismissed by tapping on the backgr…
AntPolkanov Jul 19, 2023
9525344
fix spacing on MyQRPage
AntPolkanov Jul 19, 2023
fe418f6
hide underline and add IME options
AntPolkanov Jul 20, 2023
b4c2573
fix carousel hight changes on Android
AntPolkanov Jul 20, 2023
b219ef1
introduce FFImageLoading.Compat package
AntPolkanov Jul 21, 2023
b83af59
enable login button after the user logs out
AntPolkanov Jul 21, 2023
1d645b8
update fluent system icons font
AntPolkanov Jul 21, 2023
f0ce6f4
fix clipped icons
AntPolkanov Jul 21, 2023
ff66a5e
Update xamarin.yml and override appsettings.json
AntPolkanov Jul 25, 2023
51a9075
add AppCenter and appsettings.json
AntPolkanov Jul 25, 2023
2b3ae4e
remove IMarkupExtension
AntPolkanov Jul 26, 2023
ce13924
rollback the use of Buttons in AchievementsGrid
AntPolkanov Jul 27, 2023
d629275
check for null correctly
AntPolkanov Jul 27, 2023
23dca3d
bump iOS version
AntPolkanov Aug 3, 2023
f03eb66
rollbacking appsettings.json because we cannot override using GitHub …
AntPolkanov Aug 3, 2023
0efcefd
bump application version
AntPolkanov Aug 4, 2023
86f605b
Add ITSAppUsesNonExemptEncryption and set it to False
AntPolkanov Aug 4, 2023
e089464
do not lower case activities
AntPolkanov Aug 4, 2023
dc5ecce
disable AndroidEnableMarshalMethods to prevent an app crash in the Re…
AntPolkanov Aug 8, 2023
cc56a78
bump Android Version Code
AntPolkanov Aug 8, 2023
cfa0a9f
fix RewardsProgress and use Border instead of Frame for achievements
AntPolkanov Aug 11, 2023
6d13d03
fix alignment issue on iOS caused by Padding
AntPolkanov Aug 11, 2023
ce34960
disable font auto scaling for some labels
AntPolkanov Aug 11, 2023
c976a39
clear search when the user switches Periods on Leaderboard page
AntPolkanov Aug 11, 2023
a188031
replace external.png icon with svg
AntPolkanov Aug 13, 2023
8661c92
fix splash screen
AntPolkanov Aug 13, 2023
0fde8e8
make Achievements rounded rectangular
AntPolkanov Aug 14, 2023
082c3ac
use dev_placeholder only as a placeholder for devs without image, not…
AntPolkanov Aug 14, 2023
33cccac
bump versions
AntPolkanov Aug 14, 2023
0fcdd2d
Added updated API client to include delete profile client
matt-goldman Aug 21, 2023
01d4d1c
Added delete profile UI
matt-goldman Aug 21, 2023
2cb45e0
Added delete profile feature
matt-goldman Aug 30, 2023
dfff506
Bumped versions, switched to OS dialogs
matt-goldman Sep 4, 2023
a2132e0
bumped Android version
matt-goldman Sep 4, 2023
fe3c3bf
Merge branch 'upgrade-to-maui-v2' of https://github.com/SSWConsulting…
matt-goldman Sep 4, 2023
bea90af
Removed iPad target device family. Fixed incorrectly renamed file.
matt-goldman Sep 5, 2023
65452ba
Updated unrecognised QR code message
matt-goldman Sep 5, 2023
cbc45fc
Bump Android version
matt-goldman Sep 27, 2023
fafbc2d
Update packages, temp change to constants
matt-goldman Sep 27, 2023
a02177d
bumped iOS version and fixed entitlements
matt-goldman Sep 27, 2023
c9f82f2
Reverted testing urls, reverted shell menu to hamburger
matt-goldman Sep 27, 2023
4de2666
Added tracking for when login errors occur
matt-goldman Sep 28, 2023
a4fdc32
Removed iPhone only restriction from info.plist and increased version…
matt-goldman Sep 28, 2023
2b915d9
Fixed icon being Android only, bumped iOS version, changed AppCenter …
matt-goldman Sep 28, 2023
2afc00d
Prepare for merge to main
matt-goldman Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 12 additions & 0 deletions .github/workflows/xamarin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ jobs:
run: |
keystore=$RUNNER_TEMP/key.keystore
echo -n "$ANDROID_SIGNING_KEY_BASE64" | base64 --decode --output $keystore

- name: Use Prod appsettings.json
env:
PROD_APPSETTINGS_JSON: ${{ secrets.PROD_APPSETTINGS_JSON }}
run: |
echo "$PROD_APPSETTINGS_JSON" > appsettings.json

- name: Extract version from tag
if: startsWith(github.ref, 'refs/tags/v')
Expand Down Expand Up @@ -108,6 +114,12 @@ jobs:
mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles

- name: Use Prod appsettings.json
env:
PROD_APPSETTINGS_JSON: ${{ secrets.PROD_APPSETTINGS_JSON }}
run: |
echo "$PROD_APPSETTINGS_JSON" > appsettings.json

- name: Extract version from tag
if: startsWith(github.ref, 'refs/tags/v')
uses: damienaicheh/extract-version-from-tag-action@v1.0.0
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,3 +460,9 @@ $RECYCLE.BIN/
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

# Files generasted by the .NET Meteor VS Code extension
.meteor/

**/appsettings.json
/src/maui/SSW.Rewards.Mobile/SSW.Rewards.Mobile/.vscode
6 changes: 1 addition & 5 deletions SSW.Rewards.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.3.32519.111
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSW.Rewards.Android", "src\SSW.Rewards.Android\SSW.Rewards.Android.csproj", "{F8A628B3-BE34-4940-B77D-0644BCAE9827}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSW.Rewards.iOS", "src\SSW.Rewards.iOS\SSW.Rewards.iOS.csproj", "{3EFE7A23-45C2-40AF-BC97-7E67EDA5614A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSW.Rewards", "src\SSW.Rewards\SSW.Rewards.csproj", "{B98A315F-FDC2-489E-A8E5-94757CF3DD9F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSW.Rewards.Mobile", "src\SSW.Rewards\SSW.Rewards.Mobile.csproj", "{B98A315F-FDC2-489E-A8E5-94757CF3DD9F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
Loading