diff --git a/app/build.gradle b/app/build.gradle index 8a26043..fbb3009 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,28 +27,15 @@ android { dependencies { - implementation 'androidx.recyclerview:recyclerview:1.0.0' implementation fileTree(include: ['*.jar'], dir: 'libs') - androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-beta02', { - exclude group: 'com.android.support', module: 'support-annotations' - }) + implementation 'androidx.recyclerview:recyclerview:1.0.0' implementation 'androidx.preference:preference:1.0.0' - implementation 'com.google.android.material:material:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3' implementation 'com.android.volley:volley:1.1.0' - //noinspection GradleDependency - implementation 'com.google.android.gms:play-services-auth:15.0.0' - implementation 'androidx.legacy:legacy-support-v4:1.0.0' - testImplementation 'junit:junit:4.12' - implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'androidx.appcompat:appcompat:1.0.2' - implementation 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2' - implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'org.jetbrains:annotations-java5:15.0' - //implementation 'com.github.quivr:android-week-view:2.0.2'//com.github.alamkanak:android-week-view:1.2.6 - implementation 'com.ms-square:expandableTextView:0.1.4' - // https://github.com/bignerdranch/expandable-recycler-view - implementation 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1' implementation 'com.github.Cutta:TagView:1.3' - implementation files('libs/jericho-html-3.4.jar') + implementation 'com.google.android.material:material:1.0.0' + implementation 'com.google.android.gms:play-services-base:16.1.0' + implementation 'com.ms-square:expandableTextView:0.1.4' + implementation 'org.jetbrains:annotations-java5:15.0' + //implementation 'com.github.quivr:android-week-view:2.0.2' //com.github.alamkanak:android-week-view:1.2.6 } diff --git a/app/src/androidTest/java/de/sebse/fuplanner/ExampleInstrumentedTest.java b/app/src/androidTest/java/de/sebse/fuplanner/ExampleInstrumentedTest.java deleted file mode 100644 index dbb0688..0000000 --- a/app/src/androidTest/java/de/sebse/fuplanner/ExampleInstrumentedTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package de.sebse.fuplanner; - -import android.content.Context; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import androidx.test.InstrumentationRegistry; -import androidx.test.runner.AndroidJUnit4; - -import static org.junit.Assert.*; - -/** - * Instrumentation test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() throws Exception { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); - - assertEquals("de.sebse.fuplanner", appContext.getPackageName()); - } -} diff --git a/app/src/main/java/de/sebse/fuplanner/tools/CustomNotificationManager.java b/app/src/main/java/de/sebse/fuplanner/tools/CustomNotificationManager.java index 73e8f46..36f8da7 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/CustomNotificationManager.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/CustomNotificationManager.java @@ -20,7 +20,7 @@ public class CustomNotificationManager { public static void sendNotification(Context context, String textTitle, String textContent) { Intent intent = new Intent(context, MainActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_TASK_ON_HOME); PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0); diff --git a/app/src/test/java/de/sebse/fuplanner/ExampleUnitTest.java b/app/src/test/java/de/sebse/fuplanner/ExampleUnitTest.java deleted file mode 100644 index 2cb0d2e..0000000 --- a/app/src/test/java/de/sebse/fuplanner/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package de.sebse.fuplanner; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file