Skip to content

Commit

Permalink
App refresh and bug fixes for v1.0.14 (#74)
Browse files Browse the repository at this point in the history
* Convert to kotlin

- remove .idea/ because they were causing issues

* Minor cleanup

- Fixup imports
- butterknife -> kotlin synthetic
- Log.* -> Timber.*

* Update prefence activity to androidx and seekbar

* Cleanup text size usage

* Update travis build tools version

* Convert and fix tests

* Remove arrays.xml in favor of text size slider

* Version bump 1.0.14
  • Loading branch information
kevinhinterlong authored Dec 3, 2019
1 parent 26c2325 commit 7a9a1c9
Show file tree
Hide file tree
Showing 60 changed files with 967 additions and 1,625 deletions.
32 changes: 24 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Built application files
*.apk
*.ap_
*.aab

# Files for the ART/Dalvik VM
*.dex
Expand Down Expand Up @@ -32,17 +33,14 @@ proguard/
# Android Studio captures folder
captures/

# Intellij
# IntelliJ
*.iml
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/dictionaries
.idea/libraries
.idea/caches/
.idea/

# Keystore files
*.jks
# Uncomment the following lines if you do not want to check your keystore files in.
#*.jks
#*.keystore

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
Expand All @@ -55,6 +53,24 @@ freeline.py
freeline/
freeline_project_description.json

# fastlane
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/readme.md

# Version control
vcs.xml

# lint
lint/intermediates/
lint/generated/
lint/outputs/
lint/tmp/
# lint/reports/


# Deploy files
app/upload.keystore
app/upload.json
Expand Down
184 changes: 0 additions & 184 deletions .idea/codeStyles/Project.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/codeStyles/codeStyleConfig.xml

This file was deleted.

4 changes: 0 additions & 4 deletions .idea/encodings.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/misc.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/modules.xml

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ env:
global:
- ANDROID_API=29
- EMULATOR_API=21
- ANDROID_BUILD_TOOLS=29.0.1
- ANDROID_BUILD_TOOLS=29.0.2
android:
components:
- build-tools-$ANDROID_BUILD_TOOLS
Expand Down
26 changes: 15 additions & 11 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ plugins {
id 'com.android.application'
id 'com.github.triplet.play' version '2.4.2'
}
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

repositories {
mavenCentral()
}

android {
applicationVariants.all { variant ->
Expand All @@ -11,13 +17,13 @@ android {
}

compileSdkVersion 29
buildToolsVersion '29.0.1'
buildToolsVersion '29.0.2'
defaultConfig {
applicationId "com.jtmcn.archwiki.viewer"
minSdkVersion 21
targetSdkVersion 29
versionCode 14
versionName "1.0.13"
versionCode 15
versionName "1.0.14"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down Expand Up @@ -53,11 +59,6 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
Expand All @@ -67,14 +68,17 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})

implementation 'com.jakewharton:butterknife:10.1.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'

implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.jakewharton.timber:timber:4.7.1'

implementation 'com.squareup.okhttp3:okhttp:3.11.0'

implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.preference:preference:1.1.0'
implementation 'androidx.core:core-ktx:1.1.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}

play {
Expand Down
16 changes: 12 additions & 4 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,15 @@
-keep class android.support.v7.** { *; }
-keep interface android.support.v7.** { *; }

# butterknife
-dontwarn butterknife.internal.**
-keep class **$$ViewInjector { *; }
-keepnames class * { @butterknife.InjectView *;}
# OkHttp
# JSR 305 annotations are for embedding nullability information.
-dontwarn javax.annotation.**

# A resource is loaded with a relative path so the package of this class must be preserved.
-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase

# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
-dontwarn org.codehaus.mojo.animal_sniffer.*

# OkHttp platform used only on JVM and when Conscrypt dependency is available.
-dontwarn okhttp3.internal.platform.ConscryptPlatform
Loading

0 comments on commit 7a9a1c9

Please sign in to comment.