Skip to content

Commit ef75e43

Browse files
TacoTheDankTacoTheDank
committed
everything else
1 parent 76f0ef0 commit ef75e43

19 files changed

+100
-191
lines changed

‎.gitignore

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
*.iml
22
.gradle
3-
/local.properties
4-
/.idea/workspace.xml
5-
/.idea/libraries
3+
local.properties
4+
.idea/
65
.DS_Store
7-
/build
8-
/captures
6+
build/
7+
captures/
98
.externalNativeBuild

‎.idea/caches/build_file_checksums.ser

-534 Bytes
Binary file not shown.

‎.idea/codeStyles/Project.xml

-29
This file was deleted.

‎.idea/gradle.xml

-18
This file was deleted.

‎.idea/misc.xml

-34
This file was deleted.

‎.idea/modules.xml

-9
This file was deleted.

‎.idea/runConfigurations.xml

-12
This file was deleted.

‎.idea/vcs.xml

-6
This file was deleted.

‎.travis.yml

+4-7
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ android:
44
components:
55
- tools
66
- platform-tools
7-
- tools
8-
- build-tools-27.0.3
9-
- build-tools-26.0.3
10-
- android-27
7+
- build-tools-28.0.3
8+
- android-28
119

1210
script:
1311
- ./gradlew clean build
@@ -16,6 +14,5 @@ before_install:
1614
- mkdir "$ANDROID_HOME/licenses" || true
1715
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
1816
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
19-
- echo yes | sdkmanager "build-tools;27.0.3"
20-
- echo yes | sdkmanager "build-tools;26.0.3"
21-
- echo yes | sdkmanager "platforms;android-26"
17+
- echo yes | sdkmanager "build-tools;28.0.3"
18+
- echo yes | sdkmanager "platforms;android-28"

‎app/build.gradle

+22-13
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 26
5-
buildToolsVersion "27.0.3"
4+
compileSdkVersion 28
5+
buildToolsVersion '28.0.3'
6+
67
defaultConfig {
78
applicationId "org.sw24softwares.starkeverben"
89
minSdkVersion 17
9-
targetSdkVersion 26
10+
targetSdkVersion 28
1011
versionCode 12
1112
versionName "3.1.2"
13+
1214
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1315
vectorDrawables.useSupportLibrary = true
1416
}
17+
1518
buildTypes {
1619
release {
1720
minifyEnabled false
@@ -21,20 +24,26 @@ android {
2124
applicationIdSuffix ".debug"
2225
}
2326
}
27+
28+
compileOptions {
29+
sourceCompatibility JavaVersion.VERSION_1_8
30+
targetCompatibility JavaVersion.VERSION_1_8
31+
}
2432
}
2533

2634
dependencies {
27-
implementation fileTree(dir: 'libs', include: ['*.jar'])
28-
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
35+
implementation 'com.android.support:design:28.0.0'
36+
implementation 'com.android.support:support-v4:28.0.0'
37+
implementation 'com.android.support:appcompat-v7:28.0.0'
38+
39+
implementation 'com.ashokvarma.android:bottom-navigation-bar:2.1.0'
40+
implementation 'pl.bclogic:pulsator4droid:1.0.3'
41+
implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
42+
implementation 'com.github.medyo:android-about-page:1.2.4'
43+
implementation 'com.github.woxthebox:draglistview:1.6.0' //1.6.3
44+
45+
androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2', {
2946
exclude group: 'com.android.support', module: 'support-annotations'
3047
})
31-
implementation 'com.android.support:appcompat-v7:26+'
32-
implementation 'com.android.support:design:26+'
33-
implementation 'com.github.PhilJay:MPAndroidChart:v3.0.2'
34-
implementation 'com.ashokvarma.android:bottom-navigation-bar:2.0.4'
35-
implementation 'pl.bclogic:pulsator4droid:1.0.3'
36-
implementation 'com.github.medyo:android-about-page:1.2.2'
37-
implementation 'com.github.woxthebox:draglistview:1.5.1'
38-
3948
testImplementation 'junit:junit:4.12'
4049
}

‎app/lint.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<lint>
3-
<issue id="MissingTranslation" severity="warning"/>
3+
<issue id="MissingTranslation" severity="warning" />
44
</lint>

‎app/src/androidTest/java/org/sw24softwares/starkeverben/ExampleInstrumentedTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.junit.Test;
88
import org.junit.runner.RunWith;
99

10-
import static org.junit.Assert.*;
10+
import static org.junit.Assert.assertEquals;
1111

1212
/**
1313
* Instrumentation test, which will execute on an Android device.

‎app/src/main/AndroidManifest.xml

+16-11
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,30 @@
88
android:label="@string/app_name"
99
android:supportsRtl="true"
1010
android:theme="@style/AppTheme">
11-
<activity android:name="org.sw24softwares.starkeverben.MainActivity"
12-
android:theme="@style/AppTheme.NoActionBar"
13-
android:configChanges="keyboardHidden|orientation|screenSize"
14-
android:launchMode="singleTop">
11+
<activity
12+
android:name="org.sw24softwares.starkeverben.MainActivity"
13+
android:configChanges="keyboardHidden|orientation|screenSize"
14+
android:launchMode="singleTop"
15+
android:theme="@style/AppTheme.NoActionBar">
1516
<intent-filter>
1617
<action android:name="android.intent.action.MAIN" />
1718
<action android:name="android.intent.action.SEARCH" />
19+
1820
<category android:name="android.intent.category.LAUNCHER" />
1921
</intent-filter>
20-
<meta-data android:name="android.app.searchable"
21-
android:resource="@xml/searchable"/>
22+
<meta-data
23+
android:name="android.app.searchable"
24+
android:resource="@xml/searchable" />
2225
</activity>
23-
<activity android:name="org.sw24softwares.starkeverben.TestActivity"
24-
android:configChanges="keyboardHidden|orientation|screenSize" />
26+
<activity
27+
android:name="org.sw24softwares.starkeverben.TestActivity"
28+
android:configChanges="keyboardHidden|orientation|screenSize" />
2529
<activity android:name="org.sw24softwares.starkeverben.ResultActivity" />
26-
30+
2731
<activity android:name="org.sw24softwares.starkeverben.SettingsActivity" />
28-
<activity android:name="org.sw24softwares.starkeverben.AboutActivity"
29-
android:theme="@style/AppTheme.NoActionBar"/>
32+
<activity
33+
android:name="org.sw24softwares.starkeverben.AboutActivity"
34+
android:theme="@style/AppTheme.NoActionBar" />
3035
<activity android:name="org.sw24softwares.starkeverben.FormOrderActivity" />
3136
</application>
3237

‎app/src/test/java/org/sw24softwares/starkeverben/ExampleUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.junit.Test;
44

5-
import static org.junit.Assert.*;
5+
import static org.junit.Assert.assertEquals;
66

77
/**
88
* Example local unit test, which will execute on the development machine (host).

‎build.gradle

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ buildscript {
44
repositories {
55
jcenter()
66
google()
7+
maven { url "https://jitpack.io" }
78
}
9+
810
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.1.4'
11+
classpath 'com.android.tools.build:gradle:3.2.1'
1012

1113
// NOTE: Do not place your application dependencies here; they belong
1214
// in the individual module build.gradle files
@@ -15,8 +17,8 @@ buildscript {
1517

1618
allprojects {
1719
repositories {
18-
google()
1920
jcenter()
21+
google()
2022
maven { url "https://jitpack.io" }
2123
}
2224
}

‎gradle/wrapper/gradle-wrapper.jar

2.48 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Sun Sep 09 20:14:28 CEST 2018
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

0 commit comments

Comments
 (0)