[#39] Try fixing fat aar issues

Samagra-Development · Mar 28, 2023 · 68f4e51 · 68f4e51
1 parent b99dd06
commit 68f4e51
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/odk/collect/entities/src/main/res/layout/entities_layout.xml b/odk/collect/entities/src/main/res/layout/entities_layout.xml
@@ -15,10 +15,9 @@
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:defaultNavHost="true"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/app_bar_layout"
-        app:navGraph="@navigation/entities_nav" />
+        />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/odk/collect/entities/src/main/res/navigation/entities_nav.xml b/odk/collect/entities/src/main/res/navigation/entities_nav.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/main"
-    app:startDestination="@id/datasets">
+    android:id="@+id/main" >
 
     <fragment
         android:id="@+id/datasets"
         android:name="org.odk.collect.entities.DatasetsFragment"
         android:label="@string/entities_title">
         <action
             android:id="@+id/datasets_to_entities"
-            app:destination="@id/entities" />
+             />
     </fragment>
 
     <fragment
@@ -19,6 +18,6 @@
         android:label="{dataset}">
         <argument
             android:name="dataset"
-            app:argType="string" />
+             />
     </fragment>
 </navigation>
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -145,7 +145,7 @@ configurations.all {
 }
 
 dependencies {
-
+    implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.5.1'
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

diff --git a/sample/libs/extension-release.aar b/sample/libs/extension-release.aar