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

Dev merge to Master #170

Merged
merged 40 commits into from
Jul 25, 2024
Merged

Dev merge to Master #170

merged 40 commits into from
Jul 25, 2024

Conversation

htk007
Copy link
Contributor

@htk007 htk007 commented Jul 25, 2024

  • Ads kit functional refactor
  • Ads kit readme update
  • Ads Kit version update
  • map kit version update
  • location kit version update

Feyzarkt and others added 30 commits July 17, 2024 08:51
@Feyzarkt
CMS-150 # Create attrs file for necessary values
aeddf3a
@Feyzarkt
CMS-150 # Create strings file for necessary values
734dc75
@Feyzarkt
CMS-150 # Create common banner ad view
d0587c7
@Feyzarkt
CMS-150 # Delete banner ad generic load function
9993a16
@Feyzarkt
CMS-150 # Add javadoc for CommonBannerAdView.kt
341639a
@htk007
Merge pull request #156 from Explore-In-HMS/chore/CMS-150-create-comm…
8f99fd4 
…on-banner-ad-view

CMS 150 create common banner ad view
@emineinan
CMS-151 # Delete SplashAd.kt
2344c06
@emineinan
CMS-151 # Create CommonSplashAdView class
9bff3ed
@emineinan
CMS-151 # Define attrs for CommonSplashAdView
86e5fd6
@emineinan
CMS-151 # Add KDoc for CommonSplashAdView.kt
88c5970
@emineinan
CMS-151 # Add KDoc for variables
875909b
@emineinan
CMS-151 # Remove screen orientation from attrs.xml
650d77e
@Feyzarkt
CMS-155 # Add necessary strings
a573acc
@Feyzarkt
CMS-155 # Add necessary strings
798e60d
@Feyzarkt
CMS-155 # Make generic rewarded ad load function
111eb59
@htk007
Merge pull request #162 from Explore-In-HMS/chore/CMS-151-create-hms-…
da36245 
…splash-adview

CMS 151 Create HMS Splash AdView
@emineinan
CMS-154 # Make generic interstitial load function
1e16582
@emineinan
CMS-154 # Add KDoc to InterstitialAd class
be41254
@emineinan
CMS-154 # Add strings
951da0b
@emineinan
CMS-154 # Update InterstitialAd.kt
5bf6a1b
@Feyzarkt
Merge remote-tracking branch 'origin/dev' into chore/CMS-155-make-gen…
73743ed 
…eric-rewarded-load-func
@htk007
Merge pull request #164 from Explore-In-HMS/chore/CMS-155-make-generi…
9c1d645 
…c-rewarded-load-func

CMS 155 Make generic rewarded load func
@Feyzarkt
Remove spesific hms and gms dependencies for ads
f4c458f
@emineinan
Merge remote-tracking branch 'origin/dev' into chore/CMS-154-make-gen…
00b00ad 
…eric-interstitial-load-func

# Conflicts:
#	ads/src/main/res/values/strings.xml
@htk007
Merge pull request #165 from Explore-In-HMS/chore/CMS-154-make-generi…
bdd7280 
…c-interstitial-load-func

CMS 154 - Make Generic Interstitial Load Func
@emineinan
Update README.md
b8bf5de
@emineinan
Update README.md
06eeaf0
@emineinan
Update README.md
cca0411
@htk007
Merge pull request #167 from Explore-In-HMS/chore/CMS-160-update-read…
6e0bf2c 
…me-for-interstitial

CMS 160 - Update Readme for Interstitial
@emineinan
Merge remote-tracking branch 'origin/dev' into chore/CMS-159-update-r…
0a14b86 
…eadme-for-splash

# Conflicts:
#	README.md
Feyzarkt and others added 10 commits July 24, 2024 16:12
@Feyzarkt
Add banner ad usage info to readme file
6f34ec3
@Feyzarkt
Update README.md
34c0ca7
@Feyzarkt
Update README.md for rewarded ad
be5679f
@htk007
Merge pull request #166 from Explore-In-HMS/chore/CMS-159-update-read…
6323cc5 
…me-for-splash

CMS 159 - Update Readme for Splash
@Feyzarkt
Merge remote-tracking branch 'origin/dev' into chore/CMS-158-update-r…
b6550c6 
…eadme-for-banner
@htk007
Merge pull request #168 from Explore-In-HMS/chore/CMS-158-update-read…
c609139 
…me-for-banner

CMS 158 Update readme for banner
@Feyzarkt
Merge remote-tracking branch 'origin/dev' into chore/CMS-161-update-r…
b92b7aa 
…eadme-for-rewarded
@Feyzarkt
Update README.md for rewarded ad and general
40c5ce3
@Feyzarkt
Update README.md ad unit id format
1946ec2
@htk007
Merge pull request #169 from Explore-In-HMS/chore/CMS-161-update-read…
452b21b 
…me-for-rewarded

CMS 161 update readme for rewarded
@htk007 htk007 requested review from emineinan and Feyzarkt July 25, 2024 08:59
@htk007 htk007 changed the title Dev Dev merge to Master Jul 25, 2024
@emineinan emineinan added this to the Sprint6 milestone Jul 25, 2024
emineinan
emineinan approved these changes Jul 25, 2024
View reviewed changes
Copy link
Contributor

@emineinan emineinan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✔

@htk007 htk007 merged commit 74262ad into master Jul 25, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emineinan emineinan emineinan approved these changes

@Feyzarkt Feyzarkt Awaiting requested review from Feyzarkt

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Sprint6
Development

Successfully merging this pull request may close these issues.
3 participants
@htk007 @emineinan @Feyzarkt