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.

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

chore: fix fmt script and run it #325

Merged
merged 1 commit into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions ios/Plugin/Banner/BannerExecutor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Capacitor
import GoogleMobileAds

class BannerExecutor: NSObject, GADBannerViewDelegate {
public weak var plugin: AdMob?
weak var plugin: AdMob?
var bannerView: GADBannerView!

func showBanner(_ call: CAPPluginCall, _ request: GADRequest, _ adUnitID: String) {
Expand Down Expand Up @@ -144,7 +144,7 @@ class BannerExecutor: NSObject, GADBannerViewDelegate {
}

/// Tells the delegate an ad request loaded an ad.
public func bannerViewDidReceiveAd(_ bannerView: GADBannerView) {
func bannerViewDidReceiveAd(_ bannerView: GADBannerView) {
NSLog("bannerViewDidReceiveAd")

self.plugin?.notifyListeners(BannerAdPluginEvents.SizeChanged.rawValue, data: [
Expand All @@ -155,8 +155,8 @@ class BannerExecutor: NSObject, GADBannerViewDelegate {
}

/// Tells the delegate an ad request failed.
public func bannerView(_ bannerView: GADBannerView,
didFailToReceiveAdWithError error: Error) {
func bannerView(_ bannerView: GADBannerView,
didFailToReceiveAdWithError error: Error) {
NSLog("bannerView:didFailToReceiveAdWithError: \(error.localizedDescription)")
self.removeBannerViewToView()
self.plugin?.notifyListeners(BannerAdPluginEvents.SizeChanged.rawValue, data: [
Expand All @@ -169,18 +169,18 @@ class BannerExecutor: NSObject, GADBannerViewDelegate {
])
}

public func bannerViewDidRecordImpression(_ bannerView: GADBannerView) {
func bannerViewDidRecordImpression(_ bannerView: GADBannerView) {
self.plugin?.notifyListeners(BannerAdPluginEvents.AdImpression.rawValue, data: [:])
}

/// Tells the delegate that a full-screen view will be presented in response
/// to the user clicking on an ad.
public func bannerViewWillPresentScreen(_ bannerView: GADBannerView) {
func bannerViewWillPresentScreen(_ bannerView: GADBannerView) {
self.plugin?.notifyListeners(BannerAdPluginEvents.Opened.rawValue, data: [:])
}

/// Tells the delegate that the full-screen view will be dismissed.
public func bannerViewWillDismissScreen(_ bannerView: GADBannerView) {
func bannerViewWillDismissScreen(_ bannerView: GADBannerView) {
self.plugin?.notifyListeners(BannerAdPluginEvents.Closed.rawValue, data: [:])
}
}
2 changes: 1 addition & 1 deletion ios/Plugin/Consent/ConsentExecutor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import GoogleMobileAds
import UserMessagingPlatform

class ConsentExecutor: NSObject {
public weak var plugin: AdMob?
weak var plugin: AdMob?

func requestConsentInfo(_ call: CAPPluginCall, _ debugGeography: Int, _ testDeviceIdentifiers: [String], _ tagForUnderAgeOfConsent: Bool) {
let parameters = UMPRequestParameters()
Expand Down
8 changes: 4 additions & 4 deletions ios/Plugin/Interstitial/AdInterstitialExecutor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Capacitor
import GoogleMobileAds

class AdInterstitialExecutor: NSObject, GADFullScreenContentDelegate {
public weak var plugin: AdMob?
weak var plugin: AdMob?
var interstitial: GADInterstitialAd!

func prepareInterstitial(_ call: CAPPluginCall, _ request: GADRequest, _ adUnitID: String) {
Expand Down Expand Up @@ -45,20 +45,20 @@ class AdInterstitialExecutor: NSObject, GADFullScreenContentDelegate {
}
}

public func ad(_ ad: GADFullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
func ad(_ ad: GADFullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
NSLog("InterstitialFullScreenDelegate Ad failed to present full screen content with error \(error.localizedDescription).")
self.plugin?.notifyListeners(InterstitialAdPluginEvents.FailedToShow.rawValue, data: [
"code": 0,
"message": error.localizedDescription
])
}

public func adWillPresentFullScreenContent(_ ad: GADFullScreenPresentingAd) {
func adWillPresentFullScreenContent(_ ad: GADFullScreenPresentingAd) {
NSLog("InterstitialFullScreenDelegate Ad did present full screen content.")
self.plugin?.notifyListeners(InterstitialAdPluginEvents.Showed.rawValue, data: [:])
}

public func adDidDismissFullScreenContent(_ ad: GADFullScreenPresentingAd) {
func adDidDismissFullScreenContent(_ ad: GADFullScreenPresentingAd) {
NSLog("InterstitialFullScreenDelegate Ad did dismiss full screen content.")
self.plugin?.notifyListeners(InterstitialAdPluginEvents.Dismissed.rawValue, data: [:])
}
Expand Down
2 changes: 1 addition & 1 deletion ios/Plugin/Plugin.swift
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class AdMob: CAPPlugin {

@objc func setApplicationVolume(_ call: CAPPluginCall) {
if var volume = call.getFloat("volume") {
//Clamp volumes.
// Clamp volumes.
if volume < 0.0 {volume = 0.0} else if volume > 1.0 {volume = 1.0}

GADMobileAds.sharedInstance().applicationVolume = volume
Expand Down
8 changes: 4 additions & 4 deletions ios/Plugin/Rewarded/AdRewardExecutor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Capacitor
import GoogleMobileAds

class AdRewardExecutor: NSObject, GADFullScreenContentDelegate {
public weak var plugin: AdMob?
weak var plugin: AdMob?
var rewardedAd: GADRewardedAd!

func prepareRewardVideoAd(_ call: CAPPluginCall, _ request: GADRequest, _ adUnitID: String) {
Expand Down Expand Up @@ -66,20 +66,20 @@ class AdRewardExecutor: NSObject, GADFullScreenContentDelegate {
}
}

public func ad(_ ad: GADFullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
func ad(_ ad: GADFullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
NSLog("RewardFullScreenDelegate Ad failed to present full screen content with error \(error.localizedDescription).")
self.plugin?.notifyListeners(RewardAdPluginEvents.FailedToShow.rawValue, data: [
"code": 0,
"message": error.localizedDescription
])
}

public func adWillPresentFullScreenContent(_ ad: GADFullScreenPresentingAd) {
func adWillPresentFullScreenContent(_ ad: GADFullScreenPresentingAd) {
NSLog("RewardFullScreenDelegate Ad did present full screen content.")
self.plugin?.notifyListeners(RewardAdPluginEvents.Showed.rawValue, data: [:])
}

public func adDidDismissFullScreenContent(_ ad: GADFullScreenPresentingAd) {
func adDidDismissFullScreenContent(_ ad: GADFullScreenPresentingAd) {
NSLog("RewardFullScreenDelegate Ad did dismiss full screen content.")
self.plugin?.notifyListeners(RewardAdPluginEvents.Dismissed.rawValue, data: [:])
}
Expand Down
10 changes: 0 additions & 10 deletions ios/PluginTests/PluginTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,6 @@ import Capacitor

class PluginTests: XCTestCase {

override func setUp() {
super.setUp()
// Put setup code here. This method is called before the invocation of each test method in the class.
}

override func tearDown() {
// Put teardown code here. This method is called after the invocation of each test method in the class.
super.tearDown()
}

func testEcho() {
XCTAssertEqual(1, 1)
// This is an example of a functional test case for a plugin.
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"verify:android": "cd android && ./gradlew clean build test && cd ..",
"verify:web": "npm run build",
"lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
"fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- autocorrect --format",
"fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --fix --format",
"eslint": "eslint src/. --ext ts",
"prettier": "prettier \"{src/*.ts,**/*.java}\"",
"swiftlint": "node-swiftlint",
Expand Down Expand Up @@ -81,7 +81,7 @@
"git add"
],
"*.swift": [
"npm run swiftlint -- autocorrect --format",
"npm run swiftlint -- --fix --format",
"git add"
]
},
Expand Down
Loading