javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: cleanup android refs

Browse Source
This commit is contained in:
Nathan Walker
2025-07-15 12:01:45 -07:00
parent 7bc57216c0
commit 2fb70c1f10
27 changed files with 283 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/utils/debug-source.ts
View File

@@ -16,7 +16,7 @@ function getCurrentAppPath(): string {
return appPath;
} else {
const dir = (getNativeApp() as android.app.Application).getApplicationContext().getFilesDir();
const dir = getNativeApp<android.app.Application>().getApplicationContext().getFilesDir();
return `${dir.getCanonicalPath()}/app`;
}

14
packages/core/utils/index.android.ts
View File

@@ -1,7 +1,7 @@
import { Trace } from '../trace';
import { getFileExtension } from './utils-shared';
import { SDK_VERSION } from './constants';
import { android as AndroidUtils } from './native-helper';
import { android as androidUtils } from './native-helper';
import { topmost } from '../ui/frame/frame-stack';
import { debounce, throttle } from './shared';
@@ -61,7 +61,7 @@ export function releaseNativeObject(object: java.lang.Object) {
}
export function openUrl(location: string): boolean {
const context = AndroidUtils.getApplicationContext();
const context = androidUtils.getApplicationContext();
try {
const intent = new android.content.Intent(android.content.Intent.ACTION_VIEW, android.net.Uri.parse(location.trim()));
intent.addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -79,7 +79,7 @@ export function openUrl(location: string): boolean {
export function openUrlAsync(location: string): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
try {
const context = AndroidUtils.getApplicationContext();
const context = androidUtils.getApplicationContext();
const intent = new android.content.Intent(android.content.Intent.ACTION_VIEW, android.net.Uri.parse(location.trim()));
intent.addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(intent);
@@ -140,7 +140,7 @@ function getMimeTypeNameFromExtension(filePath: string): string {
* @returns {boolean} whether opening the file succeeded or not
*/
export function openFile(filePath: string, title: string = 'Open File...'): boolean {
const context = AndroidUtils.getApplicationContext();
const context = androidUtils.getApplicationContext();
try {
// Ensure external storage is available
if (!isExternalStorageAvailable()) {
@@ -222,13 +222,13 @@ Please ensure you have your manifest correctly configured with the FileProvider.
}
export function dismissSoftInput(nativeView?: any): void {
AndroidUtils.dismissSoftInput(nativeView);
androidUtils.dismissSoftInput(nativeView);
}
export function dismissKeyboard() {
dismissSoftInput();
const modalDialog = (topmost()?._modalParent ?? (topmost()?.modal as any))?._dialogFragment?.getDialog();
const view = modalDialog ?? AndroidUtils.getCurrentActivity();
const view = modalDialog ?? androidUtils.getCurrentActivity();
if (view) {
const focus = view.getCurrentFocus();
@@ -240,7 +240,7 @@ export function dismissKeyboard() {
export function copyToClipboard(value: string) {
try {
const clipboard = AndroidUtils.getApplicationContext().getSystemService(android.content.Context.CLIPBOARD_SERVICE);
const clipboard = androidUtils.getApplicationContext().getSystemService(android.content.Context.CLIPBOARD_SERVICE);
const clip = android.content.ClipData.newPlainText('Clipboard value', value);
clipboard.setPrimaryClip(clip);
} catch (err) {

6
packages/core/utils/layout-helper/index.android.ts
View File

@@ -1,5 +1,5 @@
import * as layoutCommon from './layout-helper-common';
import { android as AndroidUtils } from '../native-helper';
import { android as androidUtils } from '../native-helper';
// export * from './layout-helper-common';
@@ -38,7 +38,7 @@ export namespace layout {
export function makeMeasureSpec(size: number, mode: number): number {
if (sdkVersion === undefined) {
// check whether the old layout is needed
sdkVersion = AndroidUtils.getApplicationContext().getApplicationInfo().targetSdkVersion;
sdkVersion = androidUtils.getApplicationContext().getApplicationInfo().targetSdkVersion;
useOldMeasureSpec = sdkVersion <= 17;
}
@@ -51,7 +51,7 @@ export namespace layout {
export function getDisplayDensity(): number {
if (density === undefined) {
density = AndroidUtils.getResources().getDisplayMetrics().density;
density = androidUtils.getResources().getDisplayMetrics().density;
}
return density;

6
packages/core/utils/native-helper.android.ts
View File

@@ -1,10 +1,14 @@
import { platformCheck } from './platform-check';
// importing this helper as a separate file avoids "android" symbol clash with the global android object
import { resources, getApplication, getCurrentActivity, getApplicationContext, getWindow, getResources, getPackageName, getInputMethodManager, showSoftInput, dismissSoftInput } from './native-helper-for-android';
import { resources, collections, getWindow, getApplication, getCurrentActivity, getApplicationContext, getResources, getPackageName, getInputMethodManager, showSoftInput, dismissSoftInput } from './native-helper-for-android';
export { dataSerialize, dataDeserialize } from './native-helper-for-android';
export { getWindow } from './native-helper-for-android';
export const android = {
resources,
collections,
getApplication,
getCurrentActivity,
getApplicationContext,

329
packages/core/utils/native-helper.d.ts vendored
View File

@@ -14,211 +14,42 @@ export function dataDeserialize(nativeData?: any): any;
*/
export function isRealDevice(): boolean;
export function getWindow(): UIWindow | android.view.Window;
// /**
// * Module with android specific utilities.
// */
// declare namespace AndroidUtils {
// /**
// * Gets the native Android application instance.
// */
// export function getApplication(): any; /* android.app.Application */
// /**
// * Get the current native Android activity.
// */
// export function getCurrentActivity(): any; /* android.app.Activity */
// /**
// * Gets the native Android application resources.
// */
// export function getResources(): any; /* android.content.res.Resources */
// /**
// * Gets the Android application context.
// */
// export function getApplicationContext(): any; /* android.content.Context */
// /**
// * Gets the native Android input method manager.
// */
// export function getInputMethodManager(): any; /* android.view.inputmethod.InputMethodManager */
// /**
// * Hides the soft input method, usually a soft keyboard.
// */
// export function dismissSoftInput(nativeView?: any /* android.view.View */): void;
// /**
// * Shows the soft input method, usually a soft keyboard.
// */
// export function showSoftInput(nativeView: any /* android.view.View */): void;
// /**
// * Utility module dealing with some android collections.
// */
// namespace collections {
// /**
// * Converts string array into a String [hash set](http://developer.android.com/reference/java/util/HashSet.html).
// * @param str - An array of strings to convert.
// */
// export function stringArrayToStringSet(str: string[]): any;
// /**
// * Converts string hash set into array of strings.
// * @param stringSet - A string hash set to convert.
// */
// export function stringSetToStringArray(stringSet: any): string[];
// }
// /**
// * Utility module related to android resources.
// */
// export namespace resources {
// /**
// * Gets the drawable id from a given name.
// * @param name - Name of the resource.
// */
// export function getDrawableId(name);
// /**
// * Gets the string id from a given name.
// * @param name - Name of the resource.
// */
// export function getStringId(name);
// /**
// * Gets the id from a given name.
// * @param name - Name of the resource.
// */
// export function getId(name: string): number;
// /**
// * Gets the id from a given name with optional type.
// * This sets an explicit package name.
// * https://developer.android.com/reference/android/content/res/Resources#getIdentifier(java.lang.String,%20java.lang.String,%20java.lang.String)
// * @param name - Name of the resource.
// * @param type - (Optional) type
// */
// export function getResource(name: string, type?: string): number;
// }
// }
// /**
// * Module with ios specific utilities.
// */
// declare namespace iOSUtils {
// // Common properties between UILabel, UITextView and UITextField
// export interface TextUIView {
// font: any;
// textAlignment: number;
// textColor: any;
// text: string;
// attributedText: any;
// lineBreakMode: number;
// numberOfLines: number;
// }
// /**
// * Utility module dealing with some iOS collections.
// */
// export namespace collections {
// /**
// * Converts JavaScript array to [NSArray](https://developer.apple.com/library/ios/documentation/Cocoa/Reference/Foundation/Classes/NSArray_Class/).
// * @param str - JavaScript string array to convert.
// */
// export function jsArrayToNSArray<T>(str: T[]): NSArray<T>;
// /**
// * Converts NSArray to JavaScript array.
// * @param a - NSArray to convert.
// */
// export function nsArrayToJSArray<T>(a: NSArray<T>): T[];
// }
// /**
// * Get the root UIViewController of the app
// */
// export function getRootViewController(): any; /* UIViewController */
// /**
// * Get the UIWindow of the app
// */
// export function getWindow(): any; /* UIWindow */
// /**
// * Set the window background color of base view of the app.
// * Often this is shown when opening a modal as the view underneath scales down revealing the window color.
// * @param value color (hex, rgb, rgba, etc.)
// */
// export function setWindowBackgroundColor(value: string): void;
// /**
// * Data serialize and deserialize helpers
// */
// export function dataSerialize(data?: any): any;
// export function dataDeserialize(nativeData?: any): any;
// /**
// * @deprecated use application.orientation instead
// *
// * Gets an information about if current mode is Landscape.
// */
// export function isLandscape(): boolean;
// /**
// * Gets the iOS device major version (for 8.1 will return 8).
// */
// export const MajorVersion: number;
// /**
// * Opens file with associated application.
// * @param filePath The file path.
// */
// export function openFile(filePath: string): boolean;
// /**
// * Gets the currently visible(topmost) UIViewController.
// * @param rootViewController The root UIViewController instance to start searching from (normally window.rootViewController).
// * Returns the visible UIViewController.
// */
// export function getVisibleViewController(rootViewController: any /* UIViewController*/): any; /* UIViewController*/
// /**
// * Checks whether the application is running on real device and not on simulator.
// */
// export function isRealDevice(): boolean;
// /**
// * Debug utility to insert CGRect values into logging output.
// * Note: when printing a CGRect directly it will print blank so this helps show the values.
// * @param rect CGRect
// */
// export function printCGRect(rect: CGRect): void;
// /**
// * Take a snapshot of a View on screen.
// * @param view view to snapshot
// * @param scale screen scale
// */
// export function snapshotView(view: UIView, scale: number): UIImage;
// /**
// * Copy layer properties from one view to another.
// * @param view a view to copy layer properties to
// * @param toView a view to copy later properties from
// * @param (optional) custom properties to copy between both views
// */
// export function copyLayerProperties(view: UIView, toView: UIView, customProperties?: { view?: Array<string> /* Array<keyof UIView> */; layer?: Array<string> /* Array<keyof CALayer> */ }): void;
// }
type NativeWindow = android.view.Window | UIWindow;
/**
* Get the UIWindow or android.view.Window of the app
*/
export function getWindow<T extends NativeWindow>(): T;
/**
* Utilities related to Android.
*/
export const android: {
/**
* Utilities related to Android resources.
*/
resources: {
/**
* Gets the drawable id from a given name.
* @param name - Name of the resource.
*/
getDrawableId: (name) => number;
/**
* Gets the string id from a given name.
* @param name - Name of the resource.
*/
getStringId: (name) => number;
/**
* Gets the id from a given name.
* @param name - Name of the resource.
*/
getId: (name: string) => number;
/**
* Gets the id from a given name with optional type.
* This sets an explicit package name.
* https://developer.android.com/reference/android/content/res/Resources#getIdentifier(java.lang.String,%20java.lang.String,%20java.lang.String)
* @param name - Name of the resource.
* @param type - (Optional) type
*/
getResource: (name: string, type?: string) => number;
/**
* Gets a color from the current theme.
@@ -227,14 +58,54 @@ export const android: {
*/
getPaletteColor: (name: string, context: android.content.Context) => number;
};
getApplication: () => android.app.Application;
getCurrentActivity: () => androidx.appcompat.app.AppCompatActivity | android.app.Activity | null;
getApplicationContext: () => android.content.Context;
/**
* Utilities related to Android collections.
*/
collections: {
/**
* Converts string array into a String [hash set](http://developer.android.com/reference/java/util/HashSet.html).
* @param str - An array of strings to convert.
*/
stringArrayToStringSet(str: string[]): java.util.HashSet<string>;
/**
* Converts string hash set into array of strings.
* @param stringSet - A string hash set to convert.
*/
stringSetToStringArray(stringSet: any): string[];
};
/**
* @deprecated Use `Utils.getWindow<android.view.Window>()` instead.
* @returns application window.
*/
getWindow: () => android.view.Window;
/**
* Gets the native Android application instance.
*/
getApplication: () => android.app.Application;
/**
* Get the current native Android activity.
*/
getCurrentActivity: () => androidx.appcompat.app.AppCompatActivity | android.app.Activity | null;
/**
* Gets the Android application context.
*/
getApplicationContext: () => android.content.Context;
/**
* Gets the native Android application resources.
*/
getResources: () => android.content.res.Resources;
getPackageName: () => string;
/**
* Gets the native Android input method manager.
*/
getInputMethodManager: () => android.view.inputmethod.InputMethodManager;
/**
* Shows the soft input method, usually a soft keyboard.
*/
showSoftInput: (nativeView: android.view.View) => void;
/**
* Hides the soft input method, usually a soft keyboard.
*/
dismissSoftInput: (nativeView?: android.view.View) => void;
};
@@ -243,26 +114,67 @@ export const android: {
*/
export const ad = android;
/**
* Utilities related to iOS.
*/
export const ios: {
/**
* Utilities related to iOS collections.
*/
collections: {
/**
* Converts JavaScript array to [NSArray](https://developer.apple.com/library/ios/documentation/Cocoa/Reference/Foundation/Classes/NSArray_Class/).
* @param str - JavaScript string array to convert.
*/
jsArrayToNSArray<T>(str: T[]): NSArray<T>;
/**
* Converts NSArray to JavaScript array.
* @param a - NSArray to convert.
*/
nsArrayToJSArray<T>(a: NSArray<T>): Array<T>;
};
/**
* Create a UIDocumentInteractionControllerDelegate implementation for use with UIDocumentInteractionController
*/
createUIDocumentInteractionControllerDelegate: () => NSObject;
/**
* @deprecated Use `Utils.getWindow<UIWindow>()` instead.
* @returns application window.
*/
getWindow: () => UIWindow;
/**
* Gets the root folder for the current application. This Folder is private for the application and not accessible from Users/External apps.
* iOS - this folder is read-only and contains the app and all its resources.
*/
getCurrentAppPath: () => string;
/**
* Get the root UIViewController of the app
*/
getRootViewController: () => UIViewController;
/**
* Gets the currently visible(topmost) UIViewController.
* @param rootViewController The root UIViewController instance to start searching from (normally window.rootViewController).
* Returns the visible UIViewController.
*/
getVisibleViewController: (rootViewController: UIViewController) => UIViewController;
getWindow: () => UIWindow;
getMainScreen: () => UIScreen;
/**
* Set the window background color of base view of the app.
* Often this is the view shown behind opening a modal, eg: a modal scales down revealing the window color.
* @param value color (hex, rgb, rgba, etc.)
*/
setWindowBackgroundColor: (value: string) => void;
/**
* @deprecated use Application.orientation instead
*
* Gets an information about if current mode is Landscape.
*/
isLandscape: () => boolean;
/**
* Take a snapshot of a View on screen.
* @param view view to snapshot
* @param scale screen scale
*/
snapshotView: (view: UIView, scale: number) => UIImage;
/**
* Applies a rotation transform over X,Y and Z axis
@@ -272,7 +184,18 @@ export const ios: {
* @param z Rotation over Z axis in degrees
*/
applyRotateTransform: (transform: CATransform3D, x: number, y: number, z: number) => CATransform3D;
/**
* Debug utility to insert CGRect values into logging output.
* Note: when printing a CGRect directly it will print blank so this helps show the values.
* @param rect CGRect
*/
printCGRect: (rect: CGRect) => void;
/**
* Copy layer properties from one view to another.
* @param view a view to copy layer properties to
* @param toView a view to copy later properties from
* @param (optional) custom properties to copy between both views
*/
copyLayerProperties: (view: UIView, toView: UIView, customProperties?: { view?: Array<keyof UIView>; layer?: Array<keyof CALayer> }) => void;
/**
* Animate views with a configurable spring effect