Merge pull request #2068 from t-arn/beep_android_1744a34

Implementation of App.beep() for Android
beeware · Aug 23, 2023 · 127e8f7 · 127e8f7
2 parents 55aa2e3 + 608ec53
commit 127e8f7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/android/src/toga_android/app.py b/android/src/toga_android/app.py
@@ -3,6 +3,7 @@
 from rubicon.java import android_events
 
 import toga
+from android.media import RingtoneManager
 from toga.command import Group
 
 from .libs.activity import IPythonApp, MainActivity
@@ -207,7 +208,11 @@ def show_about_dialog(self):
         self.interface.factory.not_implemented("App.show_about_dialog()")
 
     def beep(self):
-        self.interface.factory.not_implemented("App.beep()")
+        uri = RingtoneManager.getActualDefaultRingtoneUri(
+            self.native.getApplicationContext(), RingtoneManager.TYPE_NOTIFICATION
+        )
+        ringtone = RingtoneManager.getRingtone(self.native.getApplicationContext(), uri)
+        ringtone.play()
 
     def exit(self):
         pass

diff --git a/changes/2068.misc.rst b/changes/2068.misc.rst
@@ -0,0 +1 @@
+App.beep() has been implemented for Android.
diff --git a/examples/window/window/app.py b/examples/window/window/app.py
@@ -95,7 +95,7 @@ def do_next_content(self, widget):
         self.main_window.content = self.next_box
 
     def do_prev_content(self, widget):
-        self.main_window.content = self.main_box
+        self.main_window.content = self.main_scroller
 
     def do_hide(self, widget):
         self.main_window.visible = False
@@ -105,6 +105,9 @@ def do_hide(self, widget):
         self.main_window.visible = True
         self.main_window.info_dialog("Here we go again", "I'm back!")
 
+    def do_beep(self, widget):
+        self.app.beep()
+
     def exit_handler(self, app, **kwargs):
         self.close_count += 1
         if self.close_count % 2 == 1:
@@ -167,7 +170,9 @@ def startup(self):
             "Change content", on_press=self.do_next_content, style=btn_style
         )
         btn_hide = toga.Button("Hide", on_press=self.do_hide, style=btn_style)
-        self.main_box = toga.Box(
+        btn_beep = toga.Button("Beep", on_press=self.do_beep, style=btn_style)
+
+        self.inner_box = toga.Box(
             children=[
                 self.label,
                 btn_do_origin,
@@ -183,9 +188,16 @@ def startup(self):
                 btn_do_report,
                 btn_change_content,
                 btn_hide,
+                btn_beep,
             ],
             style=Pack(direction=COLUMN),
         )
+        self.main_scroller = toga.ScrollContainer(
+            horizontal=False,
+            vertical=True,
+            style=Pack(flex=1),
+        )
+        self.main_scroller.content = self.inner_box
 
         btn_change_back = toga.Button(
             "Go back", on_press=self.do_prev_content, style=btn_style
@@ -204,7 +216,7 @@ def startup(self):
         self.main_window.toolbar.add(restore_command)
 
         # Add the content on the main window
-        self.main_window.content = self.main_box
+        self.main_window.content = self.main_scroller
 
         # Show the main window
         self.main_window.show()