Skip to content

Commit 2ed97cb

Browse files
michaelstonismichaelstonis
committed
Merge branch 'develop'
2 parents 97d7667 + 342213d commit 2ed97cb

11 files changed

Lines changed: 130 additions & 1 deletion

‎MauiKeyboardEffects/EightBot.MauiKeyboardEffects.targets‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<!--
4+
This targets file is automatically imported by NuGet into consuming projects.
5+
It injects the iOS images and localization strings as BundleResource items so
6+
they are copied into the consuming app's bundle at build time.
7+
-->
8+
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'ios' Or '$(TargetPlatformIdentifier)' == 'maccatalyst'">
9+
10+
<!-- Keyboard images -->
11+
<BundleResource Include="$(MSBuildThisFileDirectory)ios-resources/KeyboardDismiss.png">
12+
<LogicalName>KeyboardDismiss.png</LogicalName>
13+
<Visible>false</Visible>
14+
</BundleResource>
15+
<BundleResource Include="$(MSBuildThisFileDirectory)ios-resources/KeyboardDismiss@2x.png">
16+
<LogicalName>KeyboardDismiss@2x.png</LogicalName>
17+
<Visible>false</Visible>
18+
</BundleResource>
19+
<BundleResource Include="$(MSBuildThisFileDirectory)ios-resources/KeyboardDismiss@3x.png">
20+
<LogicalName>KeyboardDismiss@3x.png</LogicalName>
21+
<Visible>false</Visible>
22+
</BundleResource>
23+
<BundleResource Include="$(MSBuildThisFileDirectory)ios-resources/KeyboardErase.png">
24+
<LogicalName>KeyboardErase.png</LogicalName>
25+
<Visible>false</Visible>
26+
</BundleResource>
27+
<BundleResource Include="$(MSBuildThisFileDirectory)ios-resources/KeyboardErase@2x.png">
28+
<LogicalName>KeyboardErase@2x.png</LogicalName>
29+
<Visible>false</Visible>
30+
</BundleResource>
31+
<BundleResource Include="$(MSBuildThisFileDirectory)ios-resources/KeyboardErase@3x.png">
32+
<LogicalName>KeyboardErase@3x.png</LogicalName>
33+
<Visible>false</Visible>
34+
</BundleResource>
35+
36+
<!-- Localization strings (unique table name avoids conflicts with consumer's Localizable.strings) -->
37+
<BundleResource Include="$(MSBuildThisFileDirectory)ios-resources/de.lproj/MauiKeyboardEffectsLocalizable.strings">
38+
<LogicalName>de.lproj/MauiKeyboardEffectsLocalizable.strings</LogicalName>
39+
<Visible>false</Visible>
40+
</BundleResource>
41+
<BundleResource Include="$(MSBuildThisFileDirectory)ios-resources/en.lproj/MauiKeyboardEffectsLocalizable.strings">
42+
<LogicalName>en.lproj/MauiKeyboardEffectsLocalizable.strings</LogicalName>
43+
<Visible>false</Visible>
44+
</BundleResource>
45+
<BundleResource Include="$(MSBuildThisFileDirectory)ios-resources/es.lproj/MauiKeyboardEffectsLocalizable.strings">
46+
<LogicalName>es.lproj/MauiKeyboardEffectsLocalizable.strings</LogicalName>
47+
<Visible>false</Visible>
48+
</BundleResource>
49+
<BundleResource Include="$(MSBuildThisFileDirectory)ios-resources/fr.lproj/MauiKeyboardEffectsLocalizable.strings">
50+
<LogicalName>fr.lproj/MauiKeyboardEffectsLocalizable.strings</LogicalName>
51+
<Visible>false</Visible>
52+
</BundleResource>
53+
<BundleResource Include="$(MSBuildThisFileDirectory)ios-resources/he.lproj/MauiKeyboardEffectsLocalizable.strings">
54+
<LogicalName>he.lproj/MauiKeyboardEffectsLocalizable.strings</LogicalName>
55+
<Visible>false</Visible>
56+
</BundleResource>
57+
<BundleResource Include="$(MSBuildThisFileDirectory)ios-resources/it.lproj/MauiKeyboardEffectsLocalizable.strings">
58+
<LogicalName>it.lproj/MauiKeyboardEffectsLocalizable.strings</LogicalName>
59+
<Visible>false</Visible>
60+
</BundleResource>
61+
<BundleResource Include="$(MSBuildThisFileDirectory)ios-resources/nl.lproj/MauiKeyboardEffectsLocalizable.strings">
62+
<LogicalName>nl.lproj/MauiKeyboardEffectsLocalizable.strings</LogicalName>
63+
<Visible>false</Visible>
64+
</BundleResource>
65+
<BundleResource Include="$(MSBuildThisFileDirectory)ios-resources/sv.lproj/MauiKeyboardEffectsLocalizable.strings">
66+
<LogicalName>sv.lproj/MauiKeyboardEffectsLocalizable.strings</LogicalName>
67+
<Visible>false</Visible>
68+
</BundleResource>
69+
70+
</ItemGroup>
71+
</Project>

‎MauiKeyboardEffects/MauiKeyboardEffects.csproj‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,62 @@
8080
</None>
8181
</ItemGroup>
8282

83+
<!--
84+
Pack the MSBuild targets file and all iOS resources into the NuGet package.
85+
NuGet auto-imports build/net9.0-ios/EightBot.MauiKeyboardEffects.targets into
86+
consuming projects, which adds the resources as BundleResource items so they
87+
are included in the consuming app's iOS bundle.
88+
-->
89+
<ItemGroup>
90+
<None Include="EightBot.MauiKeyboardEffects.targets"
91+
Pack="true"
92+
PackagePath="build/" />
93+
94+
<!-- Keyboard images -->
95+
<None Include="Platforms/iOS/Resources/KeyboardDismiss.png"
96+
Pack="true"
97+
PackagePath="build/ios-resources/" />
98+
<None Include="Platforms/iOS/Resources/KeyboardDismiss@2x.png"
99+
Pack="true"
100+
PackagePath="build/ios-resources/" />
101+
<None Include="Platforms/iOS/Resources/KeyboardDismiss@3x.png"
102+
Pack="true"
103+
PackagePath="build/ios-resources/" />
104+
<None Include="Platforms/iOS/Resources/KeyboardErase.png"
105+
Pack="true"
106+
PackagePath="build/ios-resources/" />
107+
<None Include="Platforms/iOS/Resources/KeyboardErase@2x.png"
108+
Pack="true"
109+
PackagePath="build/ios-resources/" />
110+
<None Include="Platforms/iOS/Resources/KeyboardErase@3x.png"
111+
Pack="true"
112+
PackagePath="build/ios-resources/" />
113+
114+
<!-- Localization strings -->
115+
<None Include="Platforms/iOS/Resources/de.lproj/MauiKeyboardEffectsLocalizable.strings"
116+
Pack="true"
117+
PackagePath="build/ios-resources/de.lproj/" />
118+
<None Include="Platforms/iOS/Resources/en.lproj/MauiKeyboardEffectsLocalizable.strings"
119+
Pack="true"
120+
PackagePath="build/ios-resources/en.lproj/" />
121+
<None Include="Platforms/iOS/Resources/es.lproj/MauiKeyboardEffectsLocalizable.strings"
122+
Pack="true"
123+
PackagePath="build/ios-resources/es.lproj/" />
124+
<None Include="Platforms/iOS/Resources/fr.lproj/MauiKeyboardEffectsLocalizable.strings"
125+
Pack="true"
126+
PackagePath="build/ios-resources/fr.lproj/" />
127+
<None Include="Platforms/iOS/Resources/he.lproj/MauiKeyboardEffectsLocalizable.strings"
128+
Pack="true"
129+
PackagePath="build/ios-resources/he.lproj/" />
130+
<None Include="Platforms/iOS/Resources/it.lproj/MauiKeyboardEffectsLocalizable.strings"
131+
Pack="true"
132+
PackagePath="build/ios-resources/it.lproj/" />
133+
<None Include="Platforms/iOS/Resources/nl.lproj/MauiKeyboardEffectsLocalizable.strings"
134+
Pack="true"
135+
PackagePath="build/ios-resources/nl.lproj/" />
136+
<None Include="Platforms/iOS/Resources/sv.lproj/MauiKeyboardEffectsLocalizable.strings"
137+
Pack="true"
138+
PackagePath="build/ios-resources/sv.lproj/" />
139+
</ItemGroup>
140+
83141
</Project>

‎MauiKeyboardEffects/Platforms/iOS/KeyboardExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static void Text(this KeyboardButtonType returnKeyType, KeyboardButton ke
2626
break;
2727
default:
2828
var bundle = NSBundle.FromClass(new ObjCRuntime.Class(typeof(NumericKeyboardView)));
29-
keyboardButton.SetTitle(bundle.GetLocalizedString($"NumericKeyboard.return-key.{returnKeyType.ToString().ToLowerInvariant()}"), UIControlState.Normal);
29+
keyboardButton.SetTitle(bundle.GetLocalizedString($"NumericKeyboard.return-key.{returnKeyType.ToString().ToLowerInvariant()}", string.Empty, "MauiKeyboardEffectsLocalizable"), UIControlState.Normal);
3030
break;
3131
}
3232
}

MauiKeyboardEffects/Platforms/iOS/Resources/de.lproj/Localizable.strings renamed to MauiKeyboardEffects/Platforms/iOS/Resources/de.lproj/MauiKeyboardEffectsLocalizable.strings

File renamed without changes.

MauiKeyboardEffects/Platforms/iOS/Resources/en.lproj/Localizable.strings renamed to MauiKeyboardEffects/Platforms/iOS/Resources/en.lproj/MauiKeyboardEffectsLocalizable.strings

File renamed without changes.

MauiKeyboardEffects/Platforms/iOS/Resources/es.lproj/Localizable.strings renamed to MauiKeyboardEffects/Platforms/iOS/Resources/es.lproj/MauiKeyboardEffectsLocalizable.strings

File renamed without changes.

MauiKeyboardEffects/Platforms/iOS/Resources/fr.lproj/Localizable.strings renamed to MauiKeyboardEffects/Platforms/iOS/Resources/fr.lproj/MauiKeyboardEffectsLocalizable.strings

File renamed without changes.

MauiKeyboardEffects/Platforms/iOS/Resources/he.lproj/Localizable.strings renamed to MauiKeyboardEffects/Platforms/iOS/Resources/he.lproj/MauiKeyboardEffectsLocalizable.strings

File renamed without changes.

MauiKeyboardEffects/Platforms/iOS/Resources/it.lproj/Localizable.strings renamed to MauiKeyboardEffects/Platforms/iOS/Resources/it.lproj/MauiKeyboardEffectsLocalizable.strings

File renamed without changes.

MauiKeyboardEffects/Platforms/iOS/Resources/nl.lproj/Localizable.strings renamed to MauiKeyboardEffects/Platforms/iOS/Resources/nl.lproj/MauiKeyboardEffectsLocalizable.strings

File renamed without changes.

0 commit comments

Comments
 (0)