Merge branch 'master' of https://github.com/k-oss/Mammut

jamiesanson · Jan 18, 2020 · d41ad00 · d41ad00
2 parents 036adbd + fd99bdb
commit d41ad00
Show file tree

Hide file tree

Showing 215 changed files with 3,761 additions and 3,094 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -52,6 +52,10 @@ android {
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
+
+    lintOptions {
+        abortOnError false
+    }
 }
 
 repositories {
@@ -67,7 +71,9 @@ dependencies {
     api project(":base")
     api project(":instances")
     api project(":toot")
+    api project(":feed")
     api project(":data")
+    api project(":emoji")
     api project(":notifications")
 
     api rootProject.ext.kotlinRuntime
@@ -144,6 +150,9 @@ dependencies {
     api rootProject.ext.lottie
 
     api rootProject.ext.customTabsHelper
+    api rootProject.ext.customTabs
+
+    api rootProject.ext.workManager
 }
 
 androidExtensions {

diff --git a/app/src/debug/res/drawable/ic_launcher_background.xml b/app/src/debug/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,5 @@
+<vector android:height="108dp" android:viewportHeight="108"
+    android:viewportWidth="108" android:width="108dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF"
+        android:pathData="M0.15,0.15h108v108h-108z"/>
+</vector>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -38,11 +38,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".feature.instancebrowser.InstanceBrowserActivity" />
-
-        <activity
-            android:name=".feature.instance.InstanceActivity"
-            android:windowSoftInputMode="adjustResize"/>
 
         <meta-data
             android:name="io.fabric.ApiKey"
@@ -58,6 +53,13 @@
             android:name=".feature.instance.MultiInstanceActivity"
             android:windowSoftInputMode="adjustResize" />
 
+        <!-- Disable the WorkManagerInitializer such that we can use our own worker factory -->
+        <provider
+            android:name="androidx.work.impl.WorkManagerInitializer"
+            android:authorities="${applicationId}.workmanager-init"
+            android:enabled="false"
+            android:exported="false" />
+
     </application>
 
 </manifest>