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

6.1.6 #87

Open
wants to merge 106 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
016606c
Adding Tablayout on Schedule, smooth scrolling to target
Advice-Dog Jul 16, 2019
f05fa68
Removing progress bar from Event View
Advice-Dog Jul 16, 2019
2a49506
Removing dividers from Event View
Advice-Dog Jul 16, 2019
883313e
Changing Category from Chip to Dot
Advice-Dog Jul 16, 2019
2e94200
Styling Day/Time View Holders
Advice-Dog Jul 16, 2019
22379ce
Adding sticky headers
Advice-Dog Jul 16, 2019
e803cdf
Adding sticky headers
Advice-Dog Jul 16, 2019
f38666e
DaySelectorView
Advice-Dog Jul 18, 2019
88f18fb
Merge branch 'feature/schedule-redesign' of https://github.com/shorts…
Advice-Dog Jul 18, 2019
d0547ee
Implementing StickyHeader
Advice-Dog Jul 18, 2019
ed8a0f1
Saving animation state in DaySelectorView
Advice-Dog Jul 22, 2019
9e7b9ef
Merge branch 'develop' into feature/schedule-redesign
Advice-Dog Jul 22, 2019
614ff00
Fixing getNextConference
Advice-Dog Jul 22, 2019
8eacd03
Adding FAQ to ListAdapter
Advice-Dog Jul 22, 2019
4e33bb6
Moving Speakers, Vendors and FAQ to Information Fragment
Advice-Dog Jul 22, 2019
1fbebf7
Removing TabLayout from ScheduleFragment
Advice-Dog Jul 23, 2019
f6b94a3
Adding Articles
Advice-Dog Jul 23, 2019
9cadbde
Adding HeaderViewHolder, fixing ArticlesViewHolder
Advice-Dog Jul 23, 2019
5708d5b
Adding MIN version for EventViewHolder
Advice-Dog Jul 23, 2019
ecfc232
Adding getBookmarked
Advice-Dog Jul 23, 2019
c43f77d
Fixing Category on EventFragment
Advice-Dog Jul 23, 2019
2e4b9fb
Adding FAQ model
Advice-Dog Jul 29, 2019
e680725
Fixing crash on empty schedule
Advice-Dog Jul 29, 2019
0e0d974
Fixing display mode on SpeakersFragment
Advice-Dog Jul 29, 2019
324db9c
Fixing spacing on EventView
Advice-Dog Jul 29, 2019
2e1aeb7
Refactoring Schedule to dispaly Types
Advice-Dog Jul 29, 2019
902c723
Hardcoding Contests/Workshops for DEFCON27
Advice-Dog Jul 29, 2019
9ca2612
Fixing day selector for Defcon
Advice-Dog Jul 29, 2019
ceb0ab5
Merge branch 'develop' into feature/schedule-redesign
Advice-Dog Jul 30, 2019
af162de
Fixing imports, schedule adapter position
Advice-Dog Jul 30, 2019
afff50d
Updating modules, adding gradle.properties
Advice-Dog Jul 31, 2019
3e0625a
Fixing HomeViewModel values
Advice-Dog Jul 31, 2019
2a70eac
Fixing overlap on event view
Advice-Dog Jul 31, 2019
2ce4aff
Handling contests/workshops in getSchedule
Advice-Dog Jul 31, 2019
560bee9
Fixing nav drawer workshops/contests
Advice-Dog Jul 31, 2019
8d793fc
Adding Support Hotline
Advice-Dog Aug 1, 2019
203a3b6
Fixing Day Selector
Advice-Dog Aug 1, 2019
8d41dfd
Removing TickTimer from MainActivity
Advice-Dog Aug 1, 2019
1b3cde0
Extracting Styles
Advice-Dog Aug 1, 2019
bd86810
Fixing Style, adding ability to change theme
Advice-Dog Aug 1, 2019
ba51820
Improving Time Width
Advice-Dog Aug 2, 2019
423563a
Fixing Schedule bugs
Advice-Dog Aug 2, 2019
dd3cbc4
Removing TickTimer
Advice-Dog Aug 2, 2019
a7f385b
Moving Toolbar to Schedule Fragment
Advice-Dog Aug 2, 2019
babd719
Merge branch 'feature/schedule-redesign' into feature/extract-styles
Advice-Dog Aug 2, 2019
43613fb
Updating styles
Advice-Dog Aug 2, 2019
70ad684
Improving Styles with Toolbars / StatusBar
Advice-Dog Aug 2, 2019
df7b5d2
Adding hamburger menu to Schedule
Advice-Dog Aug 2, 2019
0aa9271
Fixing more theme styling
Advice-Dog Aug 2, 2019
cd323cb
Adding Hamburger Menu to each Fragment
Advice-Dog Aug 2, 2019
498f10c
Adding Settings
Advice-Dog Aug 2, 2019
e53f47e
Fixing InformationFragment order
Advice-Dog Aug 3, 2019
8fb67eb
Fixing Event/Speaker fragments
Advice-Dog Aug 3, 2019
a048f8f
Adding storage for nav drawer and force time zone.
Advice-Dog Aug 3, 2019
0118373
Fixing Storage / Settings
Advice-Dog Aug 4, 2019
9a51060
Adding force timezone settings
Advice-Dog Aug 4, 2019
e62c002
Improving Styles
Advice-Dog Aug 4, 2019
56f7b53
Moving Filters to ScheduleFragment
Advice-Dog Aug 4, 2019
4706b80
Making HomeViewModel no longer update on Bookmarks
Advice-Dog Aug 4, 2019
3103294
Setting Home to default, cleaning up themes
Advice-Dog Aug 4, 2019
e8f54c5
Fixing remaining Styling issues
Advice-Dog Aug 4, 2019
b5808a0
Revert: Forcing colour regardless of theme
Advice-Dog Aug 4, 2019
35b0e1b
Revert: Removing themes and info
Advice-Dog Aug 4, 2019
e2c4133
6.1.0
Advice-Dog Aug 4, 2019
ea0926a
Merge pull request #85 from shortstack/feature/extract-styles
Advice-Dog Aug 5, 2019
a7c512e
Handling crash on -1 index in Day Selector
Advice-Dog Aug 5, 2019
a5d04a2
Reimplementing search
Advice-Dog Aug 5, 2019
350c85a
6.1.1
Advice-Dog Aug 5, 2019
22b6869
DaySelectorView is now Scrollable
Advice-Dog Aug 5, 2019
ec2c59c
setting isDev to BuildConfig
Advice-Dog Aug 5, 2019
69692d2
6.1.2
Advice-Dog Aug 5, 2019
51182de
Adding new setting
Advice-Dog Aug 6, 2019
130f142
Adding Event map button
Advice-Dog Aug 6, 2019
d9195ba
Fixing timestamp bug
Advice-Dog Aug 6, 2019
647ca03
Adding in themes
Advice-Dog Aug 6, 2019
62d9b98
InformationFragment to use ViewPager
Advice-Dog Aug 6, 2019
9a6b73d
Adding Theme storage
Advice-Dog Aug 6, 2019
226d02b
Fixing WiFi helper
Advice-Dog Aug 6, 2019
d649547
Adding Code of Conduct, styling improvements
Advice-Dog Aug 6, 2019
374d704
Refactoring Vendor view
Advice-Dog Aug 6, 2019
e8d104a
Refactoring Speaker View
Advice-Dog Aug 6, 2019
eb31aca
Handling legacy versions for Wifi helper
Advice-Dog Aug 6, 2019
f653b99
Fixing cache issue on maps
Advice-Dog Aug 7, 2019
af35eb0
Scrolling DaySelector to current day
Advice-Dog Aug 7, 2019
e10236b
Fixing scroll to position in Schedule Fragment
Advice-Dog Aug 7, 2019
a41f120
Fixing sorting on articles
Advice-Dog Aug 7, 2019
4075332
Themeing
Advice-Dog Aug 7, 2019
003fca3
6.1.3
Advice-Dog Aug 7, 2019
53a1ad9
Adding themes to proguard
Advice-Dog Aug 7, 2019
a4176d4
6.1.4
Advice-Dog Aug 7, 2019
3be63aa
Fixing WiFiHelper
Advice-Dog Aug 8, 2019
5e6be6e
Removing easter eggs, unlocking all themes
Advice-Dog Sep 3, 2019
ac80613
Adding timezone to Conference, force timezone fix
Advice-Dog Sep 3, 2019
48ff8fa
Adding .php to wifi helper link
Advice-Dog Sep 3, 2019
c29f60b
Fixing Home Fragment observer
Advice-Dog Sep 3, 2019
ddfe493
6.1.6
Advice-Dog Sep 3, 2019
b0ca804
Updating Gradle, adding HackerTrackerViewModel
Advice-Dog Oct 25, 2019
23e7147
Implementing HackerTrackerViewModel
Advice-Dog Oct 25, 2019
25ebdaf
Removing MaterialDialog, add radio button to Theme/Con chooser
Advice-Dog Nov 5, 2019
dc8f102
Removing extra themes
Advice-Dog Nov 5, 2019
4da6574
Removing FirebaseMessagingService
Advice-Dog Nov 5, 2019
6de84a9
Fixing Home with ViewModel
Advice-Dog Nov 5, 2019
8e30666
Removing filtered types
Advice-Dog Nov 5, 2019
b82ba39
Removing remaining ViewModels
Advice-Dog Nov 5, 2019
69b846e
6.2.0
Advice-Dog Nov 5, 2019
2c1ed2f
Develop (#90)
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.

40 changes: 5 additions & 35 deletions .idea/misc.xml

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

9 changes: 0 additions & 9 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
Loading