Skip to content

Commit ac5a629

Browse files
authored
Merge branch 'master' into bottomNavigationXML
2 parents a6f57f9 + 73f7e25 commit ac5a629

File tree

6 files changed

+108
-40
lines changed

6 files changed

+108
-40
lines changed

android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java

+13-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@
7373
TiC.PROPERTY_WINDOW_PIXEL_FORMAT,
7474
TiC.PROPERTY_FLAG_SECURE,
7575
TiC.PROPERTY_BAR_COLOR,
76-
TiC.PROPERTY_STATUS_BAR_COLOR
76+
TiC.PROPERTY_STATUS_BAR_COLOR,
77+
TiC.PROPERTY_UI_FLAGS
7778
})
7879

7980
public class WindowProxy extends TiWindowProxy implements TiActivityWindow
@@ -338,6 +339,10 @@ public void windowCreated(TiBaseActivity activity, Bundle savedInstanceState)
338339
}
339340
}
340341

342+
if (hasProperty(TiC.PROPERTY_UI_FLAGS)) {
343+
win.getDecorView().setSystemUiVisibility(TiConvert.toInt(getProperty(TiC.PROPERTY_UI_FLAGS)));
344+
}
345+
341346
// Handle titleAttributes property.
342347
if (hasProperty(TiC.PROPERTY_TITLE_ATTRIBUTES)) {
343348
KrollDict innerAttributes = getProperties().getKrollDict(TiC.PROPERTY_TITLE_ATTRIBUTES);
@@ -472,6 +477,13 @@ public void onPropertyChanged(String name, Object value)
472477
}
473478
}
474479

480+
if (name.equals(TiC.PROPERTY_UI_FLAGS)) {
481+
if (windowActivity != null && windowActivity.get() != null) {
482+
AppCompatActivity activity = windowActivity.get();
483+
activity.getWindow().getDecorView().setSystemUiVisibility(TiConvert.toInt(value));
484+
}
485+
}
486+
475487
if (name.equals(TiC.PROPERTY_TITLE_ATTRIBUTES)) {
476488
if (windowActivity != null && windowActivity.get() != null) {
477489
// Get a reference to the ActionBar.

android/titanium/src/java/org/appcelerator/titanium/TiC.java

+1
Original file line numberDiff line numberDiff line change
@@ -862,6 +862,7 @@ public class TiC
862862
public static final String PROPERTY_JOBTITLE = "jobTitle";
863863
public static final String PROPERTY_DEPARTMENT = "department";
864864
public static final String PROPERTY_FIXED_SIZE = "fixedSize";
865+
public static final String PROPERTY_UI_FLAGS = "uiFlags";
865866

866867
public static final String SIZE_AUTO = "auto";
867868
public static final String URL_APP_PREFIX = "app://";

apidoc/Titanium/UI/Window.yml

+10
Original file line numberDiff line numberDiff line change
@@ -1539,6 +1539,16 @@ properties:
15391539
since: "3.3.0"
15401540
availability: creation
15411541

1542+
- name: uiFlags
1543+
summary: Additional UI flags to set on the Activity Window.
1544+
description: |
1545+
See [WindowManager.LayoutParams](https://developer.android.com/reference/android/view/View#setSystemUiVisibility\(int\)) for a
1546+
list of additional flags that can be assigned to this property. For example, you can use `8192` (SYSTEM_UI_FLAG_LIGHT_STATUS_BAR) to set
1547+
the status bar text color to a dark color.
1548+
platforms: [android]
1549+
type: Number
1550+
since: "12.7.0"
1551+
15421552
- name: windowSoftInputMode
15431553
summary: |
15441554
Determines whether a window's soft input area (ie software keyboard) is visible

iphone/iphone/Titanium.plist

-4
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@
5959
<string>Can we use your microphone?</string>
6060
<key>NSPhotoLibraryUsageDescription</key>
6161
<string>Can we save to your photo library?</string>
62-
<key>UIAppFonts</key>
63-
<array>
64-
<string>comic_zine_ot.otf</string>
65-
</array>
6662
<key>UILaunchStoryboardName</key>
6763
<string>LaunchScreen</string>
6864
<key>UIRequiresFullScreen</key>

package-lock.json

+82-33
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"colors": "1.4.0",
100100
"ejs": "3.1.9",
101101
"fields": "0.1.24",
102-
"fs-extra": "11.2.0",
102+
"fs-extra": "10.0.0",
103103
"ioslib": "1.7.39",
104104
"liveview": "1.5.6",
105105
"lodash.merge": "4.6.2",
@@ -155,7 +155,7 @@
155155
"nyc": "15.1.0",
156156
"request-promise-native": "1.0.9",
157157
"rollup": "2.76.0",
158-
"ssri": "10.0.4",
158+
"ssri": "8.0.1",
159159
"stream-splitter": "0.3.2",
160160
"strip-ansi": "6.0.1",
161161
"titanium": "6.1.1",

0 commit comments

Comments
 (0)