Revert "input: Replace open-coded types with ndk::event definitions (#163)"

This reverts commit 51d05d4 for
backwards compatibility with the existing `0.6` releases.

For now, it's creating a lot of busy work having to always make this
revert in order to test various topic branch changes with winit 0.30.

Lets save this breaking change until we have more reasons to break
semver compatibility (in itself this doesn't fix or enable any features,
so we can live without it for now).

Author: MarijnS95

android-activity/CHANGELOG.md

@@ -6,19 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Changed
-- input: Replaced custom types with their `ndk` crate equivalent.
-  > [!NOTE]
-  > These types existed because the `ndk` crate didn't provide them in an extensible way.  Now that they have the `#[non_exhaustive]` flag and contain a `__Unknown(T)` variant to provide lossless conversions, and not to mention use an ABI type that matches how it is being used by most functions (when the original constants were defined in a "typeless" way), the `ndk` types are used and reexported once again.
+### Added
 
-  > [!IMPORTANT]
-  > **Relevant breaking changes**:
-  > - `repr()` types for some `enum`s have changed to match the ABI type that is used by most functions that are returning or consuming this wrapper type.
-  > - `Source::is_xxx_class()` functions are replaced by querying `Source::class()` and comparing against variants from the returned `SourceClass` `bitflags` enum.
-  > - `SourceFlags::TRACKBALL` (from `Source::is_trackball_class()`) is named `SourceClass::NAVIGATION` in the `ndk`.
+- The `ndk` and `ndk-sys` crates are now re-exported under `android_activity::ndk` and `android_activity::ndk_sys` ([#194](https://github.com/rust-mobile/android-activity/pull/194))
 
+### Changed
 - rust-version bumped to 1.73.0 ([#193](https://github.com/rust-mobile/android-activity/pull/193))
-- The `ndk` and `ndk-sys` crates are now re-exported under `android_activity::ndk` and `android_activity::ndk_sys` ([#194](https://github.com/rust-mobile/android-activity/pull/194))
 - GameActivity updated to 4.0.0 (requires the corresponding 4.0.0 `.aar` release from Google) ([#191](https://github.com/rust-mobile/android-activity/pull/191))
 
 ## [0.6.0] - 2024-04-26

android-activity/Cargo.toml

@@ -32,7 +32,6 @@ default = []
 game-activity = []
 native-activity = []
 api-level-30 = ["ndk/api-level-30"]
-api-level-33 = ["api-level-30", "ndk/api-level-33"]
 
 [dependencies]
 log = "0.4"

android-activity/src/game_activity/input.rs

@@ -13,12 +13,10 @@
 // The `Class` was also bound differently to `android-ndk-rs` considering how the class is defined
 // by masking bits from the `Source`.
 
-use ndk::event::ButtonState;
-
 use crate::activity_impl::ffi::{GameActivityKeyEvent, GameActivityMotionEvent};
 use crate::input::{
-    Axis, Button, EdgeFlags, KeyAction, KeyEventFlags, Keycode, MetaState, MotionAction,
-    MotionEventFlags, Pointer, PointersIter, Source, ToolType,
+    Axis, Button, ButtonState, EdgeFlags, KeyAction, KeyEventFlags, Keycode, MetaState,
+    MotionAction, MotionEventFlags, Pointer, PointersIter, Source, ToolType,
 };
 
 // Note: try to keep this wrapper API compatible with the AInputEvent API if possible
@@ -49,7 +47,7 @@ impl<'a> MotionEvent<'a> {
     ///
     #[inline]
     pub fn source(&self) -> Source {
-        let source = self.ga_event.source;
+        let source = self.ga_event.source as u32;
         source.into()
     }
 
@@ -65,7 +63,7 @@ impl<'a> MotionEvent<'a> {
     /// See [the MotionEvent docs](https://developer.android.com/reference/android/view/MotionEvent#getActionMasked())
     #[inline]
     pub fn action(&self) -> MotionAction {
-        let action = self.ga_event.action & ndk_sys::AMOTION_EVENT_ACTION_MASK as i32;
+        let action = self.ga_event.action as u32 & ndk_sys::AMOTION_EVENT_ACTION_MASK;
         action.into()
     }
 
@@ -178,7 +176,6 @@ impl<'a> MotionEvent<'a> {
     /// See [the NDK
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getbuttonstate)
     #[inline]
-    // TODO: Button enum to signify only one bitflag can be set?
     pub fn button_state(&self) -> ButtonState {
         ButtonState(self.ga_event.buttonState as u32)
     }
@@ -281,7 +278,7 @@ impl PointerImpl<'_> {
     #[inline]
     pub fn axis_value(&self, axis: Axis) -> f32 {
         let pointer = &self.event.ga_event.pointers[self.index];
-        let axis: i32 = axis.into();
+        let axis: u32 = axis.into();
         pointer.axisValues[axis as usize]
     }
 
@@ -300,7 +297,8 @@ impl PointerImpl<'_> {
     #[inline]
     pub fn tool_type(&self) -> ToolType {
         let pointer = &self.event.ga_event.pointers[self.index];
-        pointer.toolType.into()
+        let tool_type = pointer.toolType as u32;
+        tool_type.into()
     }
 }
 
@@ -667,7 +665,7 @@ impl<'a> KeyEvent<'a> {
     ///
     #[inline]
     pub fn source(&self) -> Source {
-        let source = self.ga_event.source;
+        let source = self.ga_event.source as u32;
         source.into()
     }
 
@@ -683,13 +681,13 @@ impl<'a> KeyEvent<'a> {
     /// See [the KeyEvent docs](https://developer.android.com/reference/android/view/KeyEvent#getAction())
     #[inline]
     pub fn action(&self) -> KeyAction {
-        let action = self.ga_event.action;
+        let action = self.ga_event.action as u32;
         action.into()
     }
 
     #[inline]
     pub fn action_button(&self) -> KeyAction {
-        let action = self.ga_event.action;
+        let action = self.ga_event.action as u32;
         action.into()
     }
 
@@ -719,7 +717,7 @@ impl<'a> KeyEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#akeyevent_getkeycode)
     #[inline]
     pub fn key_code(&self) -> Keycode {
-        let keycode = self.ga_event.keyCode;
+        let keycode = self.ga_event.keyCode as u32;
         keycode.into()
     }
 

android-activity/src/game_activity/mod.rs

@@ -547,11 +547,13 @@ impl AndroidAppInner {
     }
 
     pub fn enable_motion_axis(&mut self, axis: Axis) {
-        unsafe { ffi::GameActivityPointerAxes_enableAxis(axis.into()) }
+        let axis: u32 = axis.into();
+        unsafe { ffi::GameActivityPointerAxes_enableAxis(axis as i32) }
     }
 
     pub fn disable_motion_axis(&mut self, axis: Axis) {
-        unsafe { ffi::GameActivityPointerAxes_disableAxis(axis.into()) }
+        let axis: u32 = axis.into();
+        unsafe { ffi::GameActivityPointerAxes_disableAxis(axis as i32) }
     }
 
     pub fn create_waker(&self) -> AndroidAppWaker {