Skip to content

Commit d249ec1

Browse files
committed
Fixed Toolbar
1 parent f8da7d1 commit d249ec1

File tree

1 file changed

+18
-11
lines changed

1 file changed

+18
-11
lines changed

Sources/Toolbar.swift

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,24 @@ public final class AndroidToolbar: AndroidViewGroup {
4949

5050
public var title: String? {
5151

52-
@inline(__always)
5352
get { return getTitle() }
5453
set { setTitle(newValue) }
5554
}
5655

5756
public var subTitle: String? {
5857

59-
@inline(__always)
6058
get { return getSubtitle() }
6159
set { setSubtitle(newValue) }
6260
}
6361

6462
public var navigationIcon: Android.Graphics.Drawable.Drawable? {
6563

66-
@inline(__always)
6764
get { return getNavigationIcon() }
6865
set { setNavigationIcon(newValue) }
6966
}
7067

7168
public var logo: Android.Graphics.Drawable.Drawable? {
7269

73-
@inline(__always)
7470
get { return getLogo() }
7571
set { setLogo(newValue) }
7672
}
@@ -79,6 +75,10 @@ public final class AndroidToolbar: AndroidViewGroup {
7975
get { return getPopupTheme() }
8076
set { setPopupTheme(resId: newValue) }
8177
}
78+
79+
public var menu: AndroidMenuForward {
80+
get { return getMenu() }
81+
}
8282
}
8383

8484
public extension AndroidToolbar {
@@ -154,7 +154,8 @@ public extension AndroidToolbar {
154154
locals: &__locals )
155155
}
156156

157-
public func getTitle() -> String? {
157+
@inline(__always)
158+
internal func getTitle() -> String? {
158159

159160
var __locals = [jobject]()
160161

@@ -206,7 +207,8 @@ public extension AndroidToolbar {
206207
locals: &__locals )
207208
}
208209

209-
public func getSubtitle() -> String? {
210+
@inline(__always)
211+
internal func getSubtitle() -> String? {
210212

211213
var __locals = [jobject]()
212214

@@ -240,7 +242,8 @@ public extension AndroidToolbar {
240242
locals: &__locals )
241243
}
242244

243-
public func setNavigationIcon(_ icon: Android.Graphics.Drawable.Drawable?) {
245+
@inline(__always)
246+
internal func setNavigationIcon(_ icon: Android.Graphics.Drawable.Drawable?) {
244247

245248
var __locals = [jobject]()
246249

@@ -257,7 +260,8 @@ public extension AndroidToolbar {
257260
locals: &__locals )
258261
}
259262

260-
public func getNavigationIcon() -> Android.Graphics.Drawable.Drawable? {
263+
@inline(__always)
264+
internal func getNavigationIcon() -> Android.Graphics.Drawable.Drawable? {
261265

262266
var __locals = [jobject]()
263267

@@ -298,7 +302,8 @@ public extension AndroidToolbar {
298302
locals: &__locals )
299303
}
300304

301-
public func setLogo(_ icon: Android.Graphics.Drawable.Drawable?) {
305+
@inline(__always)
306+
internal func setLogo(_ icon: Android.Graphics.Drawable.Drawable?) {
302307

303308
var __locals = [jobject]()
304309

@@ -315,7 +320,8 @@ public extension AndroidToolbar {
315320
locals: &__locals )
316321
}
317322

318-
public func getLogo() -> Android.Graphics.Drawable.Drawable? {
323+
@inline(__always)
324+
internal func getLogo() -> Android.Graphics.Drawable.Drawable? {
319325

320326
var __locals = [jobject]()
321327

@@ -356,7 +362,8 @@ public extension AndroidToolbar {
356362
locals: &__locals )
357363
}
358364

359-
public func getMenu() -> Android.View.MenuForward {
365+
@inline(__always)
366+
internal func getMenu() -> Android.View.MenuForward {
360367

361368
var __locals = [jobject]()
362369

0 commit comments

Comments
 (0)