Skip to content

Commit b1d77b4

Browse files
committed
B4A v13.40
1 parent 2a51696 commit b1d77b4

8 files changed

Lines changed: 32 additions & 37 deletions

File tree

B4AObjects/src/anywheresoftware/b4a/keywords/Common.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
* These are the internal keywords.
7171
*/
7272
@ActivityObject
73-
@Version(13.20f)
73+
@Version(13.40f)
7474
public class Common {
7575
static {
7676
System.out.println("common created.");

B4AObjects/src/anywheresoftware/b4a/objects/collections/Map.java

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -138,19 +138,7 @@ public boolean ContainsKey(Object Key) {
138138
*/
139139
public IterableList Keys()
140140
{
141-
return new IterableList() {
142-
143-
@Override
144-
public Object Get(int index) {
145-
return Map.this.GetKeyAt(index);
146-
}
147-
148-
@Override
149-
public int getSize() {
150-
return Map.this.getSize();
151-
}
152-
153-
};
141+
return new IterableMap(true);
154142
}
155143
/**
156144
* Returns an object which can be used to iterate over all the values with a For Each block.
@@ -161,21 +149,29 @@ public int getSize() {
161149
*/
162150
public IterableList Values()
163151
{
164-
return new IterableList() {
165-
166-
@Override
167-
public Object Get(int index) {
168-
return Map.this.GetValueAt(index);
169-
}
152+
return new IterableMap(false);
153+
}
154+
@Hide
155+
public class IterableMap implements IterableList {
156+
private final Iterator iterator;
157+
public IterableMap(boolean keys) {
158+
if (keys)
159+
iterator = getObject().keySet().iterator();
160+
else
161+
iterator = getObject().values().iterator();
162+
}
163+
@Override
164+
public int getSize() {
165+
return Map.this.getSize();
166+
}
170167

171-
@Override
172-
public int getSize() {
173-
return Map.this.getSize();
174-
}
175-
176-
};
168+
@Override
169+
public Object Get(int index) {
170+
return iterator.next();
171+
}
177172
}
178173

174+
179175
@Hide
180176
@Override
181177
public Object[] debug(int limit, boolean[] outShouldAddReflectionFields) {

Libs_ExoPlayer/src/anywheresoftware/b4a/objects/SimpleExoPlayerWrapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
*/
5555
@SuppressWarnings("deprecation")
5656
@ShortName("SimpleExoPlayer")
57-
@Version(3.02f)
57+
@Version(3.10f)
5858
@DependsOn(values={
5959
"media3-common-1.2.0.aar",
6060
"media3-container-1.2.0.aar",
@@ -69,7 +69,7 @@
6969
"media3-extractor-1.2.0.aar",
7070
"media3-ui-1.2.0.aar",
7171
"androidx.media:media", "androidx.recyclerview:recyclerview","androidx.customview:customview-poolingcontainer",
72-
"com.google.guava-guava"})
72+
"com.google.guava-guava", "androidx.tracing:tracing-android", "androidx.collection:collection"})
7373
@Permissions(values = {"android.permission.INTERNET"})
7474
@Events(values = {"Complete", "Error (Message As String)", "Ready", "TrackChanged"})
7575
public class SimpleExoPlayerWrapper {

Libs_FirebaseAdMob/src/anywheresoftware/b4a/admobwrapper/AdViewWrapper.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,14 @@
4747
import com.google.android.gms.ads.initialization.InitializationStatus;
4848
import com.google.android.gms.ads.initialization.OnInitializationCompleteListener;
4949

50-
@Version(3.02f)
50+
@Version(3.20f)
5151
@ShortName("AdView")
5252
@Events(values={"ReceiveAd", "FailedToReceiveAd (ErrorCode As String)",
5353
"AdScreenDismissed", "PresentScreen"})
5454
@ActivityObject
5555
@DontInheritEvents
5656
@Permissions(values={"android.permission.INTERNET", "android.permission.ACCESS_NETWORK_STATE", "com.google.android.gms.permission.AD_ID"})
57-
@DependsOn(values={"com.google.firebase:firebase-ads", "gson-2.8.5", "GoogleConsent.aar", "kotlin-stdlib-1.6.10",
58-
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm"})
57+
@DependsOn(values={"com.google.firebase:firebase-ads", "gson-2.8.5", "GoogleConsent.aar"})
5958
public class AdViewWrapper extends ViewWrapper<AdView> {
6059
/**
6160
* 320dip x 50dip (default size)

Libs_FirebaseAnalytics/src/anywheresoftware/b4a/objects/FirebaseAnalyticsWrapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
import anywheresoftware.b4a.objects.collections.Map;
3434

3535
@ShortName("FirebaseAnalytics")
36-
@Version(3.01f)
36+
@Version(3.20f)
3737
@DependsOn(values={"com.google.android.gms:play-services-measurement", "com.google.firebase:firebase-common", "com.google.android.gms:play-services-measurement-api", "kotlin-stdlib-1.6.10",
38-
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm"})
38+
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", "com.google.android.datatransport:transport-runtime", "com.google.android.datatransport:transport-api", "com.google.android.datatransport:transport-backend-cct"})
3939
public class FirebaseAnalyticsWrapper extends AbsObjectWrapper<FirebaseAnalytics>{
4040
/**
4141
* Initializes the object. FirebaseAnalytics should be

Libs_FirebaseAuth/src/anywheresoftware/b4a/objects/FirebaseAuthWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"kotlin-stdlib-1.6.10.jar", "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm"
5555
, "androidx.loader:loader"})
5656
@Events(values={"SignedIn (User As FirebaseUser)", "TokenAvailable (User As FirebaseUser, Success As Boolean, TokenId As String)", "SignError (Error As Exception)"})
57-
@Version(3.01f)
57+
@Version(3.20f)
5858
public class FirebaseAuthWrapper {
5959
@Hide
6060
public FirebaseAuth auth;

Libs_FirebaseNotifications/src/anywheresoftware/b4a/objects/FirebaseNotificationsService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ public void run() {
100100
}
101101

102102
@DependsOn(values={"com.google.firebase:firebase-messaging", "com.google.firebase:firebase-core", "kotlin-stdlib-1.6.10",
103-
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm"})
104-
@Version(3.11f)
103+
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", "com.google.android.datatransport:transport-api", "com.google.android.gms:play-services-cloud-messaging"})
104+
@Version(3.20f)
105105
@ShortName("FirebaseMessaging")
106106
@Events(values={"TokenRefresh (Token As String)", "MessageArrived (Message As RemoteMessage)"})
107107
public static class FirebaseMessageWrapper extends AbsObjectWrapper<FirebaseMessaging> {

Libs_FirebaseStorage/src/anywheresoftware/b4x/objects/FirebaseStorageWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import anywheresoftware.b4a.objects.streams.File;
4646

4747
@DependsOn(values={"com.google.firebase:firebase-storage", "com.google.firebase:firebase-auth", "kotlin-stdlib-1.6.10"})
48-
@Version(3.01f)
48+
@Version(3.20f)
4949
@ShortName("FirebaseStorage")
5050
@Events(values={"UploadCompleted (ServerPath As String, Success As Boolean)",
5151
"DownloadCompleted (ServerPath As String, Success As Boolean)",

0 commit comments

Comments
 (0)