[WIP] 1517 timeline app add recording button

Apps/TimelineApp/app/build.gradle

@@ -19,6 +19,7 @@ android {
 dependencies {
 
     implementation project(path: ':core:ui')
+    implementation project(path: ':core:utils')
     implementation project(path: ':feature:timeline')
     implementation project(path: ':feature:user')
 

Apps/TimelineApp/app/src/main/AndroidManifest.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools" >
+
+
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <application
         android:name=".TimelineApplication"
@@ -15,15 +19,15 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.TWA"
         tools:targetApi="31" >
+
+
         <activity
             android:name=".MainActivity"
             android:exported="true" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
-<!--            <nav-graph android:value="@navigation/user_map" />-->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="uk.ac.cam.cares.jps.app" />
@@ -34,6 +38,8 @@
                     android:pathPattern="/sensor" />
             </intent-filter>
         </activity>
+
+
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
@@ -50,4 +56,4 @@
             android:value="true" />
     </application>
 
-</manifest>
+</manifest>

Apps/TimelineApp/app/src/main/java/uk/ac/cam/cares/jps/timeline/MainActivity.java

@@ -1,15 +1,17 @@
 package uk.ac.cam.cares.jps.timeline;
 
+
+import android.os.Bundle;
 import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
-import android.os.Bundle;
 
 import dagger.hilt.android.AndroidEntryPoint;
 import uk.ac.cam.cares.jps.timeline.databinding.ActivityMainBinding;
 
 @AndroidEntryPoint
 public class MainActivity extends AppCompatActivity {
     private static ActivityMainBinding binding;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         EdgeToEdge.enable(this);

Apps/TimelineApp/app/src/main/res/layout/activity_main.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
     <androidx.fragment.app.FragmentContainerView
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        app:navGraph="@navigation/app_navigation"
-        app:defaultNavHost="true"
         android:id="@+id/nav_host_fragment"
+        android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
+        android:layout_height="match_parent"
+        app:defaultNavHost="true"
+        app:navGraph="@navigation/app_navigation"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

Apps/TimelineApp/app/src/main/res/navigation/app_navigation.xml

@@ -7,19 +7,4 @@
     <include app:graph="@navigation/timeline_map"/>
     <include app:graph="@navigation/user_map"/>
 
-<!--    <include app:graph="@navigation/location_tracking_graph"/>-->
-<!--    <include app:graph="@navigation/routing_graph"/>-->
-<!--    <fragment-->
-<!--        android:id="@+id/mapFragment2"-->
-<!--        android:name="uk.ac.cam.cares.jps.locationtracking.MapFragment"-->
-<!--        android:label="MapFragment" />-->
-<!--    <fragment-->
-<!--        android:id="@+id/routingFragment"-->
-<!--        android:name="uk.ac.cam.cares.jps.routing.RoutingFragment"-->
-<!--        android:label="RoutingFragment" >-->
-<!--        <action-->
-<!--            android:id="@+id/action_routingFragment_to_mapFragment2"-->
-<!--            app:destination="@id/mapFragment2" />-->
-<!--    </fragment>-->
-
-</navigation>
+</navigation>

Apps/TimelineApp/app/src/main/res/values/strings.xml

@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">TWA Timeline</string>
+
 </resources>

Apps/TimelineApp/core/login/build.gradle

@@ -14,5 +14,6 @@ dependencies {
     implementation "androidx.navigation:navigation-fragment:$nav_version"
     implementation "androidx.navigation:navigation-ui:$nav_version"
 
+
     implementation project(path: ':core:utils')
 }

Apps/TimelineApp/core/login/src/main/java/uk/ac/cam/cares/jps/login/LoginRepository.java

@@ -116,7 +116,7 @@ public MaterialAlertDialogBuilder getSessionExpiredDialog(Fragment fragment) {
                 .setPositiveButton(R.string.ok, (dialogInterface, i) -> {
                     loginSource.authStateManager.clearLoginState();
                     NavDeepLinkRequest request = NavDeepLinkRequest.Builder
-                            .fromUri(Uri.parse(fragment.getString(uk.ac.cam.cares.jps.utils.R.string.login_fragment_link)))
+                            .fromUri(Uri.parse(fragment.getString(uk.ac.cam.cares.jps.utils.R.string.onboarding_fragment_link)))
                             .build();
                     NavHostFragment.findNavController(fragment).navigate(request);
                 });

Apps/TimelineApp/core/login/src/main/res/raw/auth_config.json

@@ -1,12 +1,12 @@
 {
-  "client_id": "",
-  "redirect_uri": "",
-  "end_session_redirect_uri": "",
-  "authorization_scope": "",
-  "discovery_uri": "",
-  "authorization_endpoint_uri": "",
-  "token_endpoint_uri": "",
-  "registration_endpoint_uri": "",
-  "user_info_endpoint_uri": "",
-  "https_required": true
+"client_id": "twa-timeline-app",
+"redirect_uri": "uk.ac.cam.cares.jps.twatimelineapp:/oauth2redirect",
+"end_session_redirect_uri": "uk.ac.cam.cares.jps.twatimelineapp:/oauth2redirect",
+"authorization_scope": "openid email profile offline_access",
+"discovery_uri": "http://172.30.80.1:3839/keycloak/realms/timeline/.well-known/openid-configuration",
+"authorization_endpoint_uri": "",
+"token_endpoint_uri": "",
+"registration_endpoint_uri": "",
+"user_info_endpoint_uri": "",
+"https_required": false
 }

Apps/TimelineApp/core/sensor/src/main/java/uk/ac/cam/cares/jps/sensor/data/SensorRepository.java

@@ -47,6 +47,7 @@ public SensorRepository(Context applicationContext,
      */
     public void startRecording(List<SensorType> selectedSensorTypes, RepositoryCallback<Boolean> callback) {
         LOGGER.info("start recording with selected sensors");
+        sensorCollectionStateManagerRepository.setSelectedSensors(selectedSensorTypes);
         prepareAndStartCollection(selectedSensorTypes, callback);
     }
 
@@ -92,6 +93,8 @@ public void stopRecording() {
         LOGGER.info("stop recording");
         context.stopService(serviceIntent);
         sensorCollectionStateManagerRepository.setRecordingState(false);
+        sensorCollectionStateManagerRepository.setTaskId("");
+        sensorCollectionStateManagerRepository.setSelectedSensors(new ArrayList<>());
     }
 
     /**

Apps/TimelineApp/core/sensor/src/main/java/uk/ac/cam/cares/jps/sensor/permission/PermissionHelper.java

@@ -0,0 +1,61 @@
+package uk.ac.cam.cares.jps.sensor.permission;
+
+
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.fragment.app.Fragment;
+
+import org.apache.log4j.Logger;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+
+public class PermissionHelper {
+    private final Fragment fragment;
+    private Queue<String> permissionQueue = new LinkedList<>();
+    private ActivityResultLauncher<String> launcher;
+    private final Logger LOGGER;
+    private Runnable onAllPermissionsHandled;
+
+    public PermissionHelper(Fragment fragment) {
+        this.fragment = fragment;
+        LOGGER = Logger.getLogger(PermissionHelper.class.getName() + "-" + fragment.getClass().getName());
+        registerPermissionLauncher();
+    }
+
+    private void registerPermissionLauncher() {
+        if (launcher == null) {
+            launcher = fragment.registerForActivityResult(
+                    new ActivityResultContracts.RequestPermission(),
+                    isGranted -> handlePermissionResult(isGranted)
+            );
+        }
+    }
+
+    public void requestPermissionsInChain(List<String> permissions, Runnable onAllPermissionsHandled) {
+        LOGGER.info(String.format("Received permissions: %s", permissions));
+        this.onAllPermissionsHandled = onAllPermissionsHandled;
+
+        permissionQueue.clear();
+        permissionQueue.addAll(permissions);
+        launchNextPermission();
+    }
+
+    private void launchNextPermission() {
+        String nextPermission = permissionQueue.poll();
+        if (nextPermission != null) {
+            launcher.launch(nextPermission);
+        } else {
+            LOGGER.info("All permissions processed!");
+            onAllPermissionsHandled.run();
+        }
+    }
+
+    private void handlePermissionResult(boolean granted) {
+        if (granted) {
+            launchNextPermission();
+        }
+    }
+
+}

Apps/TimelineApp/core/ui/build.gradle

@@ -4,4 +4,9 @@ apply from: "${project.rootDir}/ui.gradle"
 
 android {
     namespace 'uk.ac.cam.cares.jps.ui'
+}
+
+dependencies {
+    implementation project(path: ':core:login')
+    implementation project(path: ':core:utils')
 }