Move drawing into a separate package

Signed-off-by: Jonathan Schwender <[email protected]>

Cargo.toml

@@ -8,12 +8,16 @@ repository = "https://github.com/openharmony-rs/ohos-sys"
 keywords = ["OpenHarmony", "HarmonyOS", "ffi"]
 exclude = ["src/**/*_api11.rs", "src/**/*_api12.rs"]
 
+[workspace]
+members = ["components/drawing"]
+
 [dependencies]
 document-features = { version = "0.2", optional = true }
+ohos-drawing-sys = { path = "components/drawing", version = "0.1"}
 
 [features]
 default = ["api-10"]
-## Enables bindings to `native_drawing`
+## Enables bindings to `native_drawing`. Re-exports `ohos-drawing-sys`.
 drawing = []
 ## Enables bindings to `hilog`
 hilog = []

components/drawing/Cargo.toml

@@ -0,0 +1,36 @@
+[package]
+name = "ohos-drawing-sys"
+version = "0.1.0"
+edition = "2021"
+description = "Bindings to the `native_drawing` API of OpenHarmony OS"
+license = "Apache-2.0"
+repository = "https://github.com/openharmony-rs/ohos-sys"
+keywords = ["OpenHarmony", "HarmonyOS", "ffi", "drawing"]
+exclude = ["src/**/*_api11.rs", "src/**/*_api12.rs"]
+
+[dependencies]
+document-features = { version = "0.2", optional = true }
+
+[features]
+default = ["api-10"]
+
+#! ### OpenHarmony API level
+#! This crate by default exposes bindings for API-level 10.
+#! Optionally enable one of the `api-*` features to get access to bindings for newer
+#! OpenHarmony versions.
+
+## Enables bindings for OpenHarmony API-level 10. Enabled by default.
+## Note: this crate is empty if this feature is not selected.
+api-10 = []
+## Enables bindings for OpenHarmony API-level 11
+api-11 = ["api-10"]
+## **EXPERIMENTAL**: Enables bindings for OpenHarmony API-level 12 (beta-1).
+## Will stabilize once the final version has been released.
+api-12 = ["api-11"]
+## Document available features when building the documentation
+document-features = ["dep:document-features"]
+
+[package.metadata.docs.rs]
+features = ["document-features"]
+targets = ["aarch64-unknown-linux-ohos", "armv7-unknown-linux-ohos", "x86_64-unknown-linux-ohos"]
+all-features = true

src/drawing/bitmap/api12_additions.rs → components/drawing/src/bitmap/api12_additions.rs

@@ -1,4 +1,4 @@
-use crate::drawing::types::{
+use crate::types::{
     OH_Drawing_AlphaFormat, OH_Drawing_Bitmap, OH_Drawing_ColorFormat, OH_Drawing_Image_Info,
 };
 

src/drawing/bitmap/bitmap_api10.rs → components/drawing/src/bitmap/bitmap_api10.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 /** @brief Defines the pixel format of a bitmap, including the color type and alpha type.
 

src/drawing/bitmap/bitmap_api11.rs → components/drawing/src/bitmap/bitmap_api11.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 /** @brief Defines the pixel format of a bitmap, including the color type and alpha type.
 

src/drawing/bitmap/bitmap_api12.rs → components/drawing/src/bitmap/bitmap_api12.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 /** @brief Defines the pixel format of a bitmap, including the color type and alpha type.
 

src/drawing/brush/api11_additions.rs → components/drawing/src/brush/api11_additions.rs

@@ -1,6 +1,6 @@
 #![allow(non_snake_case)]
 
-use crate::drawing::types::{OH_Drawing_Brush, OH_Drawing_Filter, OH_Drawing_ShaderEffect};
+use crate::types::{OH_Drawing_Brush, OH_Drawing_Filter, OH_Drawing_ShaderEffect};
 
 extern "C" {
     /** @brief Obtains the alpha of a brush. The alpha is used by the brush to fill in a shape.

src/drawing/brush/api12_additions.rs → components/drawing/src/brush/api12_additions.rs

@@ -1,6 +1,6 @@
 #![allow(non_snake_case)]
 
-use crate::drawing::types::{
+use crate::types::{
     OH_Drawing_BlendMode, OH_Drawing_Brush, OH_Drawing_Filter, OH_Drawing_ShadowLayer,
 };
 

src/drawing/brush/brush_api10.rs → components/drawing/src/brush/brush_api10.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 extern "C" {
     /** @brief Creates an <b>OH_Drawing_Brush</b> object.

src/drawing/brush/brush_api11.rs → components/drawing/src/brush/brush_api11.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 extern "C" {
     /** @brief Creates an <b>OH_Drawing_Brush</b> object.

src/drawing/brush/brush_api12.rs → components/drawing/src/brush/brush_api12.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 extern "C" {
     /** @brief Creates an <b>OH_Drawing_Brush</b> object.

src/drawing/canvas/api11_additions.rs → components/drawing/src/canvas/api11_additions.rs

@@ -1,7 +1,7 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 
-use crate::drawing::types::{
+use crate::types::{
     OH_Drawing_Bitmap, OH_Drawing_Canvas, OH_Drawing_Path, OH_Drawing_Point, OH_Drawing_Rect,
     OH_Drawing_RoundRect, OH_Drawing_TextBlob,
 };

src/drawing/canvas/api12_additions.rs → components/drawing/src/canvas/api12_additions.rs

@@ -2,8 +2,8 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 
-use crate::drawing::canvas::OH_Drawing_CanvasClipOp;
-use crate::drawing::types::{
+use crate::canvas::OH_Drawing_CanvasClipOp;
+use crate::types::{
     OH_Drawing_Bitmap, OH_Drawing_BlendMode, OH_Drawing_Brush, OH_Drawing_Canvas, OH_Drawing_Image,
     OH_Drawing_Image_Info, OH_Drawing_Matrix, OH_Drawing_Path, OH_Drawing_PixelMap,
     OH_Drawing_Point2D, OH_Drawing_Point3D, OH_Drawing_Rect, OH_Drawing_Region,

src/drawing/canvas/canvas_api10.rs → components/drawing/src/canvas/canvas_api10.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 extern "C" {
     /** @brief Creates an <b>OH_Drawing_Canvas</b> object.

src/drawing/canvas/canvas_api11.rs → components/drawing/src/canvas/canvas_api11.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 impl OH_Drawing_CanvasClipOp {
     /// Clip with difference.

src/drawing/canvas/canvas_api12.rs → components/drawing/src/canvas/canvas_api12.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 impl OH_Drawing_SrcRectConstraint {
     /// Using sampling only inside bounds in a slower manner.

src/drawing/color/color_api10.rs → components/drawing/src/color/color_api10.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 extern "C" {
     /** @brief Converts four variables (alpha, red, green, and blue) into a 32-bit (ARGB) variable that describes a color.

src/drawing/color/color_api11.rs → components/drawing/src/color/color_api11.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 extern "C" {
     /** @brief Converts four variables (alpha, red, green, and blue) into a 32-bit (ARGB) variable that describes a color.

src/drawing/color/color_api12.rs → components/drawing/src/color/color_api12.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 extern "C" {
     /** @brief Converts four variables (alpha, red, green, and blue) into a 32-bit (ARGB) variable that describes a color.

src/drawing/color_filter/color_filter_api11.rs → components/drawing/src/color_filter/color_filter_api11.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 extern "C" {
     /** @brief Creates an <b>OH_Drawing_ColorFilter</b> with a blend mode.

src/drawing/color_filter/color_filter_api12.rs → components/drawing/src/color_filter/color_filter_api12.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 extern "C" {
     /** @brief Creates an <b>OH_Drawing_ColorFilter</b> with a blend mode.

src/drawing/color_space/color_space_api12.rs → components/drawing/src/color_space/color_space_api12.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 extern "C" {
     /** @brief Creates an <b>OH_Drawing_ColorSpace</b> object that represents the SRGB color space.

src/drawing/error_code/error_code_api12.rs → components/drawing/src/error_code/error_code_api12.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 impl OH_Drawing_ErrorCode {
     /// @error Operation completed successfully.

src/drawing/filter/api12_additions.rs → components/drawing/src/filter/api12_additions.rs

@@ -1,6 +1,6 @@
 #![allow(non_snake_case)]
 
-use crate::drawing::types::{OH_Drawing_ColorFilter, OH_Drawing_Filter, OH_Drawing_ImageFilter};
+use crate::types::{OH_Drawing_ColorFilter, OH_Drawing_Filter, OH_Drawing_ImageFilter};
 
 extern "C" {
     /** @brief Sets an <b>OH_Drawing_ImageFilter</b> object for an <b>OH_Drawing_Filter</b> object.

src/drawing/filter/filter_api11.rs → components/drawing/src/filter/filter_api11.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 extern "C" {
     /** @brief Creates an <b>OH_Drawing_Filter</b> object.

src/drawing/filter/filter_api12.rs → components/drawing/src/filter/filter_api12.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 extern "C" {
     /** @brief Creates an <b>OH_Drawing_Filter</b> object.

src/drawing/font/api12_additions.rs → components/drawing/src/font/api12_additions.rs

@@ -1,7 +1,7 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 
-use crate::drawing::types::{OH_Drawing_Font, OH_Drawing_TextEncoding, OH_Drawing_Typeface};
+use crate::types::{OH_Drawing_Font, OH_Drawing_TextEncoding, OH_Drawing_Typeface};
 
 impl OH_Drawing_FontHinting {
     /// glyph outlines unchanged

src/drawing/font/font_api11.rs → components/drawing/src/font/font_api11.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 extern "C" {
     /** @brief Creates an <b>OH_Drawing_Font</b> object.

src/drawing/font/font_api12.rs → components/drawing/src/font/font_api12.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 impl OH_Drawing_FontHinting {
     /// glyph outlines unchanged

src/drawing/font_collection/api12_additions.rs → components/drawing/src/font_collection/api12_additions.rs

@@ -1,6 +1,6 @@
 #![allow(non_snake_case)]
 
-use crate::drawing::text_declaration::OH_Drawing_FontCollection;
+use crate::text_declaration::OH_Drawing_FontCollection;
 
 extern "C" {
     /** @brief Disable the font collection fallback.

src/drawing/font_collection/font_collection_api10.rs → components/drawing/src/font_collection/font_collection_api10.rs

@@ -3,8 +3,8 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::text_declaration::*;
-use crate::drawing::types::*;
+use crate::text_declaration::*;
+use crate::types::*;
 
 extern "C" {
     /** @brief Creates an <b>OH_Drawing_FontCollection</b> object.

src/drawing/font_collection/font_collection_api11.rs → components/drawing/src/font_collection/font_collection_api11.rs

@@ -3,8 +3,8 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::text_declaration::*;
-use crate::drawing::types::*;
+use crate::text_declaration::*;
+use crate::types::*;
 
 extern "C" {
     /** @brief Creates an <b>OH_Drawing_FontCollection</b> object.

src/drawing/font_collection/font_collection_api12.rs → components/drawing/src/font_collection/font_collection_api12.rs

@@ -3,8 +3,8 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::text_declaration::*;
-use crate::drawing::types::*;
+use crate::text_declaration::*;
+use crate::types::*;
 
 extern "C" {
     /** @brief Creates an <b>OH_Drawing_FontCollection</b> object.

src/drawing/font_mgr/font_mgr_api12.rs → components/drawing/src/font_mgr/font_mgr_api12.rs

@@ -3,8 +3,8 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::text_typography::*;
-use crate::drawing::types::*;
+use crate::text_typography::*;
+use crate::types::*;
 
 extern "C" {
     /** @brief Creates an <b>OH_Drawing_FontMgr</b> object.

src/drawing/gpu_context/gpu_context_api12.rs → components/drawing/src/gpu_context/gpu_context_api12.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 /** @brief Defines the options about GPU context.
 

src/drawing/image/image_api12.rs → components/drawing/src/image/image_api12.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 extern "C" {
     /** @brief Creates an <b>OH_Drawing_Image</b> object.

src/drawing/image_filter/image_filter_api12.rs → components/drawing/src/image_filter/image_filter_api12.rs

@@ -3,8 +3,8 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::shader_effect::*;
-use crate::drawing::types::*;
+use crate::shader_effect::*;
+use crate::types::*;
 
 extern "C" {
     /** @brief Creates an <b>OH_Drawing_ImageFilter</b> object that blurs its input by the separate x and y sigmas.

src/drawing/mask_filter/mask_filter_api11.rs → components/drawing/src/mask_filter/mask_filter_api11.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 impl OH_Drawing_BlurType {
     /// Fuzzy inside and outside.

src/drawing/mask_filter/mask_filter_api12.rs → components/drawing/src/mask_filter/mask_filter_api12.rs

@@ -3,7 +3,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
-use crate::drawing::types::*;
+use crate::types::*;
 
 impl OH_Drawing_BlurType {
     /// Fuzzy inside and outside.