Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #90

Merged
merged 35 commits into from
Jul 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
6ebb262
Handling null conference in Settings
Advice-Dog Feb 20, 2020
ddf1b87
Fixing crash on Android 4.X
Advice-Dog Feb 20, 2020
44ddd7c
Renaming module to app
Advice-Dog Feb 21, 2020
4b71c7a
Updating multidex to AndroidX
Advice-Dog Feb 21, 2020
aa0fc7d
Adding gradle.properties
Advice-Dog Feb 21, 2020
0fceb19
Updating Build Tools, Kotlin, cleaning up build.gradle
Advice-Dog Feb 21, 2020
d0b370e
Removing old properties
Advice-Dog Feb 21, 2020
dd1ee29
Cleaning files
Advice-Dog Feb 21, 2020
eb3639d
Adding properties
Advice-Dog Feb 21, 2020
cedad98
Delete compiler.xml
Advice-Dog Feb 21, 2020
9e3c5d2
Delete encodings.xml
Advice-Dog Feb 21, 2020
a46e298
Delete vcs.xml
Advice-Dog Feb 21, 2020
a4479b0
Delete modules.xml
Advice-Dog Feb 21, 2020
a552315
Delete gradle.xml
Advice-Dog Feb 21, 2020
e631cda
Delete profiles_settings.xml
Advice-Dog Feb 21, 2020
eea125d
Adding codeStyle
Advice-Dog Feb 21, 2020
b90f41e
Merge branch 'develop' of https://github.com/Advice-Dog/HackerTracker…
Advice-Dog Feb 21, 2020
5145161
Delete hackertracker.aab
Advice-Dog Feb 21, 2020
ab51d7c
Fixing Tests Compiling
Advice-Dog Feb 21, 2020
37fe378
Removing legacy HTTP
Advice-Dog Feb 21, 2020
79520ee
Replacing PDFView
Advice-Dog Feb 21, 2020
efd159e
Fixing and adding more tests to DatabaseManager
Advice-Dog Feb 21, 2020
eaf0138
Enabling ProGuard
Advice-Dog Feb 21, 2020
4c3fdc9
Fixing crash on KitKat
Advice-Dog Feb 22, 2020
2622007
Fixing reminder task not finding event
Advice-Dog Feb 23, 2020
a1765bd
Extracting Reminder logic to separate class, adding tests
Advice-Dog Feb 23, 2020
7181729
Handling Notification Intent
Advice-Dog Feb 23, 2020
a6516b6
Upgrading Gradle and Firebase SDK
Advice-Dog Feb 24, 2020
f4de582
Fixing compiler issues
Advice-Dog Feb 24, 2020
46f5237
Bumping Amplify's cooldown days to 4
Advice-Dog Apr 7, 2020
6bafbe5
Updating Gradle 4.0.0
Advice-Dog Jun 16, 2020
feae478
Updating libraries
Advice-Dog Jun 16, 2020
b4ef915
Extracting timehop to external library
Advice-Dog Jul 28, 2020
7ebf43e
Fixing missing header issue
Advice-Dog Jul 28, 2020
ded734a
Replacing Crashlytics with Firebase
Advice-Dog Jul 28, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

122 changes: 122 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 0 additions & 22 deletions .idea/compiler.xml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/copyright/profiles_settings.xml

This file was deleted.

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

This file was deleted.

18 changes: 0 additions & 18 deletions .idea/gradle.xml

This file was deleted.

38 changes: 4 additions & 34 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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

This file was deleted.

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

This file was deleted.

File renamed without changes.
105 changes: 105 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'maven'
apply plugin: 'kotlin-kapt'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'

android {
compileSdkVersion 29
defaultConfig {
applicationId "com.shortstack.hackertracker"
minSdkVersion 16
targetSdkVersion 29
versionCode 191
versionName "6.2.0"
vectorDrawables.useSupportLibrary = true
multiDexEnabled true
}
buildTypes {
release {
minifyEnabled true
useProguard true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
}
kotlinOptions {
jvmTarget = "1.8"
}
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')

// Kotlin
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

// Support Libraries
implementation 'com.google.android.material:material:1.3.0-alpha01'
implementation 'androidx.appcompat:appcompat:1.3.0-alpha01'
implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha03'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.preference:preference:1.1.1'

implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

// Koin
implementation 'org.koin:koin-android:2.1.6'
implementation 'org.koin:koin-androidx-scope:2.1.6'
implementation 'org.koin:koin-androidx-viewmodel:2.1.6'

// Arch
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
implementation "androidx.lifecycle:lifecycle-viewmodel:2.3.0-alpha04"
implementation "android.arch.work:work-runtime-ktx:1.0.1"
implementation "android.arch.work:work-firebase:1.0.0-alpha11"

// Retrofit
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.7.0'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.2.0'
implementation 'com.squareup.okhttp3:okhttp:3.14.9'
implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'

// Pretty Logger
implementation 'com.orhanobut:logger:1.15'
// PDF Viewer
implementation 'com.github.barteksc:android-pdf-viewer:2.8.2'
// Reviews
implementation 'com.github.stkent:amplify:2.2.0'
// Firebase Job Dispatcher
implementation 'com.firebase:firebase-jobdispatcher:0.8.5'

implementation 'com.github.Advice-Dog:timehop:master-SNAPSHOT'


implementation "com.hendraanggrian.material:collapsingtoolbarlayout-subtitle:1.0.0-beta01"

// Firebase
implementation 'com.google.firebase:firebase-analytics:17.4.4'
implementation 'com.google.firebase:firebase-firestore:21.5.0'
implementation 'com.google.firebase:firebase-storage:19.1.1'
implementation 'com.google.firebase:firebase-auth:19.3.2'
implementation 'com.google.firebase:firebase-messaging:20.2.3'
implementation 'com.google.firebase:firebase-crashlytics:17.1.1'
implementation 'com.google.guava:guava:27.0.1-android'


// Coroutines
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.2.1'

implementation 'androidx.multidex:multidex:2.0.1'

testImplementation "junit:junit:4.12"
testImplementation "io.mockk:mockk:1.9.3.kotlin12"
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0"
testImplementation 'org.mockito:mockito-inline:2.21.0'
testImplementation 'org.koin:koin-test:2.0.0-beta-4'
}

File renamed without changes.
31 changes: 31 additions & 0 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Preserve annotations, line numbers, and source file names
-keepattributes *Annotation*
-keepattributes SourceFile,LineNumberTable
-keep public class * extends java.lang.Exception
-keep class com.crashlytics.** { *; }
-dontwarn com.crashlytics.**

-keepattributes Signature
-keepattributes Exceptions

-keep class com.shortstack.hackertracker.network.** { *; }
-keep class com.shortstack.hackertracker.models.** { *; }
-keep class com.shortstack.hackertracker.ui.themes.** { *; }

-dontwarn com.shortstack.hackertracker.views.**

-keep class com.shortstack.hackertracker.ui.home.HomeFragment { *; }
-keep class com.shortstack.hackertracker.ui.schedule.ScheduleFragment { *; }
-keep class com.shortstack.hackertracker.ui.maps.MapsFragment { *; }
-keep class com.shortstack.hackertracker.ui.information.faq.FAQFragment { *; }
-keep class com.shortstack.hackertracker.ui.information.vendors.VendorsFragment { *; }
-keep class com.shortstack.hackertracker.ui.search.SearchFragment { *; }
-keep class com.shortstack.hackertracker.ui.settings.SettingsFragment { *; }

-keep class android.support.v7.widget.SearchView { *; }

# Parceler configuration
-keep interface org.parceler.Parcel
-keep @org.parceler.Parcel class * { *; }
-keep class **$$Parcelable { *; }
-keep class org.parceler.Parceler$$Parcels
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
android:installLocation="auto">

<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Expand Down
Loading