Skip to content
This repository was archived by the owner on Jun 22, 2023. It is now read-only.

Commit c40b0bf

Browse files
authored
Merge pull request #91 from d-Rickyy-b/dev
Multiple fixes, improvements, file logger, Android 8 support
2 parents 1675bc5 + 5d2f7a4 commit c40b0bf

File tree

66 files changed

+1261
-801
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1261
-801
lines changed

.travis.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ sudo: required
44

55
env:
66
global:
7-
- ANDROID_API=26
8-
- EMULATOR_API=26
9-
- ANDROID_BUILD_TOOLS=27.0.3
7+
- ANDROID_API=28
8+
- EMULATOR_API=28
9+
- ANDROID_BUILD_TOOLS=28.0.3
1010

1111
android:
1212
components:
@@ -47,7 +47,9 @@ deploy:
4747
api_key:
4848
secure: SI7N7wUJfpmI3H0qL7UUDP3YKnbGMRz0PSbTcVqSDxk/4JE6Mwy5PPOJIn0kH2mQ+Yj2wKNF7f6jkTjQd8ZnkV4tv8UkjG3uRbLaGKyA1KOvJ9ZKIVFMen65dKLQI/kg6iU7+3YGpFLuqEaeHOEVz+zC1yfzSi927B3AZsF6QuJN9eNSKKIARKPCZi+/XMi4+tqGKyUtPntu6Cd4Nb12qZd5l9NwMdKcxrP0ux13j5Q+aYxFz1Oibye7TIdb3ucQ1KiQ21653fHhxB902ytZClbbyP8xfLOLZ/BrEadOUYuRVQM2whJXD32GLZ9Ue2ofuUayxkKabXrIUOsOlgXqQcE0G89c8kHB72B9K+SMad7pBW1uOOqW0QRqOv5XEziQ71nVM5SqFpbuV5ORJQZvlvScxRq4JxNIyw+fkyrYSbNoPIQLrAv/GW5PDFKlzsbL4KW55CGZPdOGhDcjcHePni/LSDm5MLj3zfTWLbxmzEVSlmHzCOaAuGgryst2HuIFX8oLkdBjTT3Hr/62a6zC0CQmsqu/qTjLhg9ZLNEPx8yB3XhgkeyaKj+Ue2nlq9iZb3zR3fwBs5V67/+p7h0l6Ssph5xNSsqH68Cj6W77Onuz2aDkNONfGtA6NrPMeSBOe+pP7LxQOPDBeUTibDX9BS43mVEOmGwG00h+jMc4pXQ=
4949
file_glob: true
50-
file: "/home/travis/build/d-Rickyy-b/MGGVertretungsplan/app/build/outputs/apk/release/*.apk"
50+
file:
51+
- "/home/travis/build/d-Rickyy-b/MGGVertretungsplan/app/build/outputs/apk/release/*.apk"
52+
- "/home/travis/build/d-Rickyy-b/MGGVertretungsplan/app/build/outputs/mapping/release/mapping.txt"
5153
on:
5254
repo: d-Rickyy-b/MGGVertretungsplan
5355
# branch: master

app/build.gradle

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ apply plugin: 'com.github.kt3k.coveralls'
33
apply from: '../jacoco.gradle'
44

55
android {
6-
compileSdkVersion 26
7-
buildToolsVersion '27.0.3'
6+
compileSdkVersion 28
7+
buildToolsVersion '28.0.3'
88

99

1010
lintOptions {
@@ -14,9 +14,9 @@ android {
1414
defaultConfig {
1515
applicationId "de.aurora.mggvertretungsplan"
1616
minSdkVersion 15
17-
targetSdkVersion 25
18-
versionCode 25
19-
versionName "3.1.5"
17+
targetSdkVersion 28
18+
versionCode 26
19+
versionName "3.2.0"
2020
multiDexEnabled true
2121
}
2222

@@ -65,17 +65,22 @@ dependencies {
6565
testImplementation 'org.mockito:mockito-core:2.7.22'
6666

6767
// Support libraries
68-
implementation 'com.android.support:support-v4:26.1.0'
69-
implementation 'com.android.support:appcompat-v7:26.1.0'
70-
implementation 'com.android.support:design:26.1.0'
71-
implementation 'com.android.support:recyclerview-v7:26.1.0'
72-
implementation 'com.android.support:cardview-v7:26.1.0'
73-
implementation 'com.android.support:preference-v7:26.1.0'
74-
implementation 'com.android.support:customtabs:26.1.0'
68+
implementation 'com.google.android.material:material:1.1.0-alpha02'
69+
implementation 'com.firebase:firebase-jobdispatcher:0.8.5'
70+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
71+
implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
72+
implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha01'
73+
implementation 'androidx.cardview:cardview:1.0.0'
74+
implementation 'androidx.preference:preference:1.1.0-alpha02'
75+
implementation 'androidx.browser:browser:1.0.0'
76+
implementation 'androidx.core:core:1.1.0-alpha03'
77+
78+
implementation "android.arch.work:work-runtime:1.0.0-alpha13"
7579

7680
// Other libraries
7781
implementation 'org.jsoup:jsoup:1.10.2'
78-
implementation 'com.github.paolorotolo:appintro:4.1.0'
82+
//noinspection GradleDependency
83+
implementation 'com.github.paolorotolo:appintro:v5.1.0'
7984
implementation 'com.thebluealliance:spectrum:0.7.1'
8085
}
8186

@@ -85,4 +90,4 @@ coveralls {
8590
tasks.coveralls {
8691
dependsOn 'testDebugUnitTestCoverage'
8792
onlyIf { System.env.'CI' }
88-
}
93+
}

app/proguard-rules.txt

Lines changed: 0 additions & 50 deletions
This file was deleted.

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
android:allowBackup="true"
1515
android:fullBackupContent="@xml/backup_descriptor"
1616
android:icon="@drawable/ic_launcher"
17+
android:name=".AppContext"
1718
android:label="@string/app_name"
1819
android:supportsRtl="false"
1920
android:theme="@style/AppTheme.Light">
@@ -38,8 +39,6 @@
3839
android:name="de.aurora.mggvertretungsplan.ui.intro.IntroActivity"
3940
android:theme="@style/AppTheme.Light.NoActionBar" />
4041

41-
<service android:name="de.aurora.mggvertretungsplan.BackgroundService" />
42-
4342
<receiver android:name="de.aurora.mggvertretungsplan.BootUpReceiver">
4443
<intent-filter>
4544
<action android:name="android.intent.action.BOOT_COMPLETED" />
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package de.aurora.mggvertretungsplan;
2+
3+
import android.app.Application;
4+
import android.content.Context;
5+
6+
public class AppContext extends Application {
7+
public static volatile Context applicationContext;
8+
9+
@Override
10+
public void onCreate() {
11+
super.onCreate();
12+
applicationContext = getApplicationContext();
13+
}
14+
}

app/src/main/java/de/aurora/mggvertretungsplan/BackgroundService.java

Lines changed: 0 additions & 183 deletions
This file was deleted.

0 commit comments

Comments
 (0)