Skip to content

Commit

Permalink
Merge pull request #1370 from mortend/java-packages
Browse files Browse the repository at this point in the history
Java packages
  • Loading branch information
mortend authored Aug 25, 2020
2 parents af8ebc1 + d7e90cb commit 8e107fa
Show file tree
Hide file tree
Showing 21 changed files with 33 additions and 33 deletions.
8 changes: 4 additions & 4 deletions Source/Fuse.Camera/Android/AndroidCamera.uno
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace Fuse.Camera
[ForeignInclude(Language.Java,
"android.provider.MediaStore",
"com.fuse.Activity",
"com.fusetools.camera.Image",
"com.fuse.camera.Image",
"android.os.Build",
"androidx.core.content.FileProvider",
"java.io.File",
Expand Down Expand Up @@ -111,7 +111,7 @@ namespace Fuse.Camera
@}
}

[ForeignInclude(Language.Java, "com.fuse.Activity", "com.fusetools.camera.Image", "android.content.Intent", "com.fusetools.camera.ImageStorageTools")]
[ForeignInclude(Language.Java, "com.fuse.Activity", "com.fuse.camera.Image", "android.content.Intent", "com.fuse.camera.ImageStorageTools")]
extern (Android) internal class TakePictureCallback
{
Promise<Image> _p;
Expand Down Expand Up @@ -154,7 +154,7 @@ namespace Fuse.Camera
}
}

[ForeignInclude(Language.Java, "android.provider.MediaStore", "com.fuse.Activity", "android.content.Intent", "com.fusetools.camera.Image", "com.fusetools.camera.ImageStorageTools", "androidx.core.content.ContextCompat")]
[ForeignInclude(Language.Java, "android.provider.MediaStore", "com.fuse.Activity", "android.content.Intent", "com.fuse.camera.Image", "com.fuse.camera.ImageStorageTools", "androidx.core.content.ContextCompat")]
extern (Android) class CheckPermissionsCommand
{
public CheckPermissionsCommand(Promise<string> p)
Expand Down Expand Up @@ -185,7 +185,7 @@ namespace Fuse.Camera
@}
}

[ForeignInclude(Language.Java, "android.provider.MediaStore", "com.fuse.Activity", "android.content.Intent", "com.fusetools.camera.Image", "com.fusetools.camera.ImageStorageTools")]
[ForeignInclude(Language.Java, "android.provider.MediaStore", "com.fuse.Activity", "android.content.Intent", "com.fuse.camera.Image", "com.fuse.camera.ImageStorageTools")]
extern (Android) class requestAndroidPermissions
{
PromiseCallback<string> _callback;
Expand Down
12 changes: 6 additions & 6 deletions Source/Fuse.CameraRoll/Android/AndroidCameraRoll.uno
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using Fuse.ImageTools;
using Uno.Permissions;
namespace Fuse.CameraRoll
{
[ForeignInclude(Language.Java, "com.fuse.Activity", "com.fusetools.camera.Image", "android.content.Intent", "com.fusetools.camera.ImageStorageTools")]
[ForeignInclude(Language.Java, "com.fuse.Activity", "com.fuse.camera.Image", "android.content.Intent", "com.fuse.camera.ImageStorageTools")]
extern (Android) internal class SelectPictureClosure
{
Promise<Image> _p;
Expand Down Expand Up @@ -59,7 +59,7 @@ namespace Fuse.CameraRoll
}
}

[ForeignInclude(Language.Java, "android.provider.MediaStore", "com.fuse.Activity", "android.content.Intent", "com.fusetools.camera.Image", "com.fusetools.camera.ImageStorageTools")]
[ForeignInclude(Language.Java, "android.provider.MediaStore", "com.fuse.Activity", "android.content.Intent", "com.fuse.camera.Image", "com.fuse.camera.ImageStorageTools")]
extern (Android) class SelectPicturePermissionCheckCommand
{
SelectPictureClosure _closure;
Expand Down Expand Up @@ -103,7 +103,7 @@ namespace Fuse.CameraRoll
}
}

[ForeignInclude(Language.Java, "android.provider.MediaStore", "com.fuse.Activity", "android.content.Intent", "com.fusetools.camera.Image", "com.fusetools.camera.ImageStorageTools")]
[ForeignInclude(Language.Java, "android.provider.MediaStore", "com.fuse.Activity", "android.content.Intent", "com.fuse.camera.Image", "com.fuse.camera.ImageStorageTools")]
extern (Android) class AddPicturePermissionCheckCommand
{
BoolPromiseCallback _callback;
Expand Down Expand Up @@ -153,7 +153,7 @@ namespace Fuse.CameraRoll

}

[ForeignInclude(Language.Java, "android.provider.MediaStore", "com.fuse.Activity", "android.content.Intent", "com.fusetools.camera.Image", "com.fusetools.camera.ImageStorageTools", "androidx.core.content.ContextCompat")]
[ForeignInclude(Language.Java, "android.provider.MediaStore", "com.fuse.Activity", "android.content.Intent", "com.fuse.camera.Image", "com.fuse.camera.ImageStorageTools", "androidx.core.content.ContextCompat")]
extern (Android) class CheckPermissionsCommand
{
public CheckPermissionsCommand(Promise<string> p)
Expand All @@ -180,7 +180,7 @@ namespace Fuse.CameraRoll
@}
}

[ForeignInclude(Language.Java, "android.provider.MediaStore", "com.fuse.Activity", "android.content.Intent", "com.fusetools.camera.Image", "com.fusetools.camera.ImageStorageTools")]
[ForeignInclude(Language.Java, "android.provider.MediaStore", "com.fuse.Activity", "android.content.Intent", "com.fuse.camera.Image", "com.fuse.camera.ImageStorageTools")]
extern (Android) class requestAndroidPermissions
{
PromiseCallback<string> _callback;
Expand Down Expand Up @@ -213,7 +213,7 @@ namespace Fuse.CameraRoll

}

[ForeignInclude(Language.Java, "android.provider.MediaStore", "com.fuse.Activity", "android.content.Intent", "com.fusetools.camera.Image", "com.fusetools.camera.ImageStorageTools")]
[ForeignInclude(Language.Java, "android.provider.MediaStore", "com.fuse.Activity", "android.content.Intent", "com.fuse.camera.Image", "com.fuse.camera.ImageStorageTools")]
extern (Android) static internal class AndroidCameraRoll
{
internal static void SelectPicture(Promise<Image> p)
Expand Down
2 changes: 1 addition & 1 deletion Source/Fuse.Common/Internal/AndroidSystemFont.uno
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using Uno;

namespace Fuse.Internal
{
[ForeignInclude(Language.Java, "fuse.android.graphics.FontListParser")]
[ForeignInclude(Language.Java, "com.fuse.android.graphics.FontListParser")]
extern(Android) static class AndroidSystemFont
{
struct Family
Expand Down
2 changes: 1 addition & 1 deletion Source/Fuse.Common/Internal/FontListParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package fuse.android.graphics;
package com.fuse.android.graphics;

import android.util.Xml;

Expand Down
4 changes: 2 additions & 2 deletions Source/Fuse.Controls.CameraView/Android/NativePhoto.uno
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ using Fuse.Resources.Exif;
namespace Fuse.Controls.Android
{
[ForeignInclude(Language.Java,
"com.fusetools.camera.ImageStorageTools",
"com.fuse.camera.ImageStorageTools",
"java.io.File",
"java.io.FileOutputStream")]
extern(ANDROID) class NativePhoto : Photo
Expand Down Expand Up @@ -267,7 +267,7 @@ namespace Fuse.Controls.Android
}

[ForeignInclude(Language.Java,
"com.fusetools.camera.ImageStorageTools",
"com.fuse.camera.ImageStorageTools",
"java.lang.Thread",
"java.lang.Runnable",
"android.graphics.Bitmap",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fusetools.webview;
package com.fuse.webview;
import android.webkit.WebView;
import android.webkit.WebChromeClient;
import android.webkit.ValueCallback;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fusetools.webview;
package com.fuse.webview;
import android.content.Intent;
import android.net.Uri;
import android.webkit.WebView;
Expand Down
2 changes: 1 addition & 1 deletion Source/Fuse.Controls.WebView/Android/JsInterface.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fusetools.webview;
package com.fuse.webview;
import com.foreign.Uno.Action_String;
import android.webkit.JavascriptInterface;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fusetools.webview;
package com.fuse.webview;

import android.webkit.WebView;
import android.content.Context;
Expand Down
2 changes: 1 addition & 1 deletion Source/Fuse.Controls.WebView/Android/WebViewForeign.uno
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ using Uno.Compiler.ExportTargetInterop;

namespace Fuse.Android.Controls.WebViewUtils
{
[ForeignInclude(Language.Java, "com.fusetools.webview.JsInterface", "com.fusetools.webview.FuseWebViewClient", "com.fusetools.webview.FuseWebChromeClient", "android.util.Log", "android.webkit.WebView", "com.fusetools.webview.ScrollableWebView")]
[ForeignInclude(Language.Java, "com.fuse.webview.JsInterface", "com.fuse.webview.FuseWebViewClient", "com.fuse.webview.FuseWebChromeClient", "android.util.Log", "android.webkit.WebView", "com.fuse.webview.ScrollableWebView")]
public static class WebViewForeign
{
[Foreign(Language.Java)]
Expand Down
4 changes: 2 additions & 2 deletions Source/Fuse.Drawing.Surface/Android/GraphicsSurface.uno
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ namespace Fuse.Drawing
"android.graphics.PorterDuffXfermode",
"android.graphics.Matrix",
"android.graphics.PorterDuff.Mode",
"com.fusetools.drawing.surface.LinearGradientStore",
"com.fusetools.drawing.surface.GraphicsSurfaceContext"
"com.fuse.drawing.surface.LinearGradientStore",
"com.fuse.drawing.surface.GraphicsSurfaceContext"
)]
[ForeignInclude(Language.Java,
"java.nio.ByteBuffer",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fusetools.drawing.surface;
package com.fuse.drawing.surface;

import android.graphics.Canvas;
import android.graphics.Bitmap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fusetools.drawing.surface;
package com.fuse.drawing.surface;

// since we need to provide the linear gradient with
// different stops based on the rotation of the phone
Expand Down
4 changes: 2 additions & 2 deletions Source/Fuse.Drawing.Surface/Android/NativeSurface.uno
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ namespace Fuse.Drawing
"android.graphics.PorterDuffXfermode",
"android.graphics.Matrix",
"android.graphics.PorterDuff.Mode",
"com.fusetools.drawing.surface.LinearGradientStore",
"com.fusetools.drawing.surface.GraphicsSurfaceContext",
"com.fuse.drawing.surface.LinearGradientStore",
"com.fuse.drawing.surface.GraphicsSurfaceContext",
)]
[ForeignInclude(Language.Java,
"java.nio.ByteBuffer",
Expand Down
4 changes: 2 additions & 2 deletions Source/Fuse.Drawing.Surface/Android/Surface.uno
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ namespace Fuse.Drawing
"android.graphics.PorterDuffXfermode",
"android.graphics.Matrix",
"android.graphics.PorterDuff.Mode",
"com.fusetools.drawing.surface.LinearGradientStore",
"com.fusetools.drawing.surface.GraphicsSurfaceContext"
"com.fuse.drawing.surface.LinearGradientStore",
"com.fuse.drawing.surface.GraphicsSurfaceContext"
)]
[ForeignInclude(Language.Java,
"java.nio.ByteBuffer",
Expand Down
2 changes: 1 addition & 1 deletion Source/Fuse.ImageTools/Android/AndroidImageUtils.uno
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ using Uno.Compiler.ExportTargetInterop;
using Android;
namespace Fuse.ImageTools
{
[ForeignInclude(Language.Java, "java.lang.Thread", "java.lang.Runnable", "android.util.Log", "android.provider.MediaStore", "com.fuse.Activity", "com.fusetools.camera.Image", "com.fusetools.camera.ImageUtils", "android.content.Intent")]
[ForeignInclude(Language.Java, "java.lang.Thread", "java.lang.Runnable", "android.util.Log", "android.provider.MediaStore", "com.fuse.Activity", "com.fuse.camera.Image", "com.fuse.camera.ImageUtils", "android.content.Intent")]
extern (Android) static internal class AndroidImageUtils
{

Expand Down
2 changes: 1 addition & 1 deletion Source/Fuse.ImageTools/Android/Image.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fusetools.camera;
package com.fuse.camera;

import android.app.Activity;
import android.content.Intent;
Expand Down
2 changes: 1 addition & 1 deletion Source/Fuse.ImageTools/Android/ImageStorageTools.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fusetools.camera;
package com.fuse.camera;

import android.app.Activity;
import android.content.ContentResolver;
Expand Down
2 changes: 1 addition & 1 deletion Source/Fuse.ImageTools/Android/ImageUtils.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fusetools.camera;
package com.fuse.camera;

import android.app.Activity;
import android.content.Intent;
Expand Down
2 changes: 1 addition & 1 deletion Source/Fuse.Maps/Android/ForeignHelpers.uno
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using Uno.Compiler.ExportTargetInterop;

namespace Fuse.Maps.Android
{
[ForeignInclude(Language.Java, "com.fusetools.maps.FuseMap", "android.util.Log", "android.graphics.Color")]
[ForeignInclude(Language.Java, "com.fuse.maps.FuseMap", "android.util.Log", "android.graphics.Color")]
extern (Android) static class ForeignHelpers
{
[Foreign(Language.Java)]
Expand Down
2 changes: 1 addition & 1 deletion Source/Fuse.Maps/Android/FuseMap.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fusetools.maps;
package com.fuse.maps;
import android.content.Context;
import android.os.Bundle;
import android.view.MotionEvent;
Expand Down

0 comments on commit 8e107fa

Please sign in to comment.