Merge branch 'main' into add-about

Author: niccokunzmann

README.md

@@ -17,14 +17,33 @@ This is an Android app with the following features:
 The app was originally developed in 2012 by [@rorist] from [FIXME Lausanne]. In
 2021, the app was transferred to the [SpaceAPI community repositories] and is
 now mainly being developed by members of [Coredump].
+You can join our [Matrix](https://matrix.org/) chat at `#spaceapi:matrix.coredump.ch`.
 
 [@rorist]: https://github.com/rorist
 [FIXME Lausanne]: https://fixme.ch/
 [SpaceAPI community repositories]: https://github.com/spaceapi-community/
 [Coredump]: https://www.coredump.ch/
 
+<a href="https://f-droid.org/packages/io.spaceapi.community.myhackerspace/"><img width="200" src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid"></a>
 <a href="https://play.google.com/store/apps/details?id=io.spaceapi.community.myhackerspace"><img width="200" src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" alt="Get it on Google Play"></a>
-<a href="https://f-droid.org/repository/browse/?fdid=ch.fixme.status"><img width="200" src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid"></a>
+
+## How it works
+
+The app will get the list of hackspaces from [https://directory.spaceapi.io](https://directory.spaceapi.io).
+You can then choose the space by its name from a list.
+When the space is chosen, the associated data is retrieved from the space's
+SpaceAPI endpoint (which is registered in the SpaceAPI directory).
+If you would like to add your space to the directory, have a look at
+[the SpaceAPI website](https://spaceapi.io/provide-an-endpoint/).
+
+### The Widget
+
+The image for the widget is specified in the SpaceAPI endpoint JSON.
+Have a look at the [schema documentation](https://spaceapi.io/docs/) to make your
+widget more pretty!
+
+1. `open.icon` - if present, the widget chooses the specific open/closed images
+2. `logo` - the widget chooses the logo of the hackspace to display
 
 ## How to Compile
 
@@ -62,3 +81,5 @@ You can also build and directly install the file to your connected smartphone:
 To see other tasks that gradle offers, run
 
     ./gradlew tasks
+
+

app/src/main/java/io/spaceapi/community/myhackerspace/Widget.java

@@ -17,6 +17,7 @@
 import android.content.SharedPreferences.Editor;
 import android.graphics.Bitmap;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.preference.PreferenceManager;
@@ -66,7 +67,7 @@ public void onDeleted(Context ctxt, int[] appWidgetIds) {
         for (int widgetId : appWidgetIds) {
             // Remove widget alarm
             PendingIntent pi = PendingIntent.getService(ctxt, widgetId,
-                    getIntent(ctxt, widgetId), 0);
+                        getIntent(ctxt, widgetId), getPendingIntentMutableFlag());
             AlarmManager am = (AlarmManager) ctxt
                     .getSystemService(Context.ALARM_SERVICE);
             am.cancel(pi);
@@ -84,6 +85,10 @@ public void onDeleted(Context ctxt, int[] appWidgetIds) {
         }
     }
 
+    protected static int getPendingIntentMutableFlag() {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ? PendingIntent.FLAG_MUTABLE : 0;
+    }
+
     protected static Intent getIntent(Context ctxt, int widgetId) {
         Intent i = new Intent(ctxt, UpdateService.class);
         i.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId);
@@ -104,7 +109,7 @@ protected static void setAlarm(Context ctxt, Intent i, int widgetId,
         // Set alarm
         AlarmManager am = (AlarmManager) ctxt
                 .getSystemService(Context.ALARM_SERVICE);
-        PendingIntent pi = PendingIntent.getService(ctxt, widgetId, i, 0);
+        PendingIntent pi = PendingIntent.getService(ctxt, widgetId, i, getPendingIntentMutableFlag());
         am.cancel(pi);
         am.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP,
                 delay, update_interval, pi);
@@ -188,7 +193,7 @@ protected static void updateWidget(final Context ctxt, int widgetId,
         Intent clickIntent = new Intent(ctxt, Main.class);
         clickIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId);
         PendingIntent pendingIntent = PendingIntent.getActivity(ctxt, widgetId,
-                clickIntent, PendingIntent.FLAG_CANCEL_CURRENT);
+                clickIntent, PendingIntent.FLAG_CANCEL_CURRENT + getPendingIntentMutableFlag());
         views.setOnClickPendingIntent(R.id.widget_image, pendingIntent);
         manager.updateAppWidget(widgetId, views);
     }

build.gradle

@@ -8,7 +8,7 @@ buildscript {
 
     dependencies {
         // Android gradle integration
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

metadata/en-US/full_description.txt

@@ -1,15 +1,16 @@
-<p>View information about hacker- and makerspaces registered in the
+<p>View information about hackerspaces and makerspaces registered in the
 <a href="https://spaceapi.io/">SpaceAPI</a> directory. This includes:</p>
 
 <ul>
     <li>Location and contact information</li>
     <li>Opening status</li>
     <li>Sensor values</li>
+    <li>A widget displaying the current open/closed status on the Android home screen</li>
     <li>...and much more!</li>
 </ul>
 
 <strong>History</strong>
 
-<p>This app was originally developed in 2012 by @rorist from FIXME Lausanne. In
-2021, the app was transferred to the SpaceAPI community repositories and is now
+<p>This app was originally developed in 2012 by @rorist from the FIXME Lausanne hackspace.
+In 2021, the app was transferred to the SpaceAPI community repositories and is now
 mainly being developed by members of Coredump.</p>