From 0e3926d002e63aac6014f6818da7cb172d44d895 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 15 Jul 2020 18:38:57 +0200 Subject: [PATCH] Move assets --- .gitignore | 3 +++ app/build.gradle | 3 +++ .../app/fedilab/android/drawers/NotificationsListAdapter.java | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3f0e177ba..9f6c5f69f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ /gradle.properties +/app/playstore/release/ +/app/lite/release/ +/app/fdroid/release/ diff --git a/app/build.gradle b/app/build.gradle index 5bc69408d..e506b5bfd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -58,17 +58,20 @@ android { sourceSets { playstore { manifest.srcFile "src/common/AndroidManifest.xml" + assets.srcDirs = ['/src/mains/assets', 'src/common/assets'] java.srcDirs = ['src/main/java', 'src/playstore/java','src/common/java'] res.srcDirs = ['src/main/res', 'src/playstore/res','src/common/res'] } fdroid { manifest.srcFile "src/common/AndroidManifest.xml" + assets.srcDirs = ['/src/mains/assets', 'src/common/assets'] java.srcDirs = ['src/main/java', 'src/fdroid/java','src/common/java'] res.srcDirs = ['src/main/res', 'src/fdroid/res','src/common/res'] } lite { manifest.srcFile "src/lite/AndroidManifest.xml" + assets.srcDirs = ['/src/mains/assets'] java.srcDirs = ['src/main/java', 'src/lite/java'] res.srcDirs = ['src/main/res', 'src/lite/res'] } diff --git a/app/src/lite/java/app/fedilab/android/drawers/NotificationsListAdapter.java b/app/src/lite/java/app/fedilab/android/drawers/NotificationsListAdapter.java index fcde1bea3..45170f1af 100644 --- a/app/src/lite/java/app/fedilab/android/drawers/NotificationsListAdapter.java +++ b/app/src/lite/java/app/fedilab/android/drawers/NotificationsListAdapter.java @@ -3,6 +3,7 @@ package app.fedilab.android.drawers; import java.util.List; import app.fedilab.android.client.Entities.Notification; +import app.fedilab.android.client.Entities.Status; /* Copyright 2020 Thomas Schneider * @@ -24,7 +25,7 @@ public class NotificationsListAdapter extends BaseNotificationsListAdapter { super(isOnWifi, behaviorWithAttachments, notifications); } - public void notificationStatusChart() { + public void notificationStatusChart(Status status) { } }