Skip to content

Commit

Permalink
Convert code to kotlin
Browse files Browse the repository at this point in the history
Add missing classes (07 -> 17)
Save characters.json to sdcard/android/data/net.north101.android.ghplayertracker
Attempt to load classes.json from sdcard/android/data/net.north101.android.ghplayertracker or default to embeded
  • Loading branch information
North101 committed Apr 21, 2018
1 parent bcc4e5e commit 1aeba71
Show file tree
Hide file tree
Showing 365 changed files with 5,796 additions and 4,512 deletions.
Binary file added .idea/caches/build_file_checksums.ser
Binary file not shown.
29 changes: 29 additions & 0 deletions .idea/codeStyles/Project.xml

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

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

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

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
Only the starting classes have been implemented and unfortauntly I don't have enough time to create the class specific attack modifier cards for them.

If you'd like to help all you need to do is the following:
* Create and fill out a .json file for the class in the assets/ folder (example .json file: https://github.com/North101/ghplayertracker/blob/master/app/src/main/assets/class_brute.json). e.g. "class_brute.json"
* Create and fill out a .json file for the class in the assets/ folder (example .json file: https://github.com/North101/ghplayertracker/blob/master/app/src/main/assets/class_01.json). e.g. "class_01.json"
* * The key for each entry in "cards" represents an image of that card in the drawable/ folder
(Note: the filename of the .json file without the .json is the class id)
* Add the class id to assets/classes.json
* Rename the appropriate class icon in the drawable/ folder to the class id e.g. "class_brute.png". This will be the icon shown on the Classes screen
* Rename the appropirate class icon in the drawable-xxxhdpi/ folder to "icon_" + class id. e.g. "icon_class_brute.png". This will be the icon for the toolbar.
* Rename the appropriate class icon in the drawable/ folder to the class id e.g. "class_01.png". This will be the icon shown on the Classes screen
* Rename the appropirate class icon in the drawable-xxxhdpi/ folder to "icon_" + class id. e.g. "icon_class_01.png". This will be the icon for the toolbar.
54 changes: 37 additions & 17 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: "kotlin-allopen"
apply plugin: "kotlin-kapt"

def AndroidSupportVersion = '27.0.2'
def AndroidSupportVersion = '27.1.1'
def AAVersion = '4.5.0-SNAPSHOT'
def ArchVersion = '1.1.1'

allprojects {
repositories {
Expand All @@ -25,31 +30,46 @@ android {
minSdkVersion 21
targetSdkVersion 27
versionCode 5
versionName "0.3.2"
versionName "0.4.0"
}
buildTypes {
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}

androidExtensions {
experimental = true
}
}

kapt {
correctErrorTypes = true
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
compile "com.android.support:design:$AndroidSupportVersion"
compile "com.android.support:appcompat-v7:$AndroidSupportVersion"
compile "com.android.support:recyclerview-v7:$AndroidSupportVersion"
compile "com.android.support:preference-v7:$AndroidSupportVersion"
compile "com.android.support:preference-v14:$AndroidSupportVersion"
compile "com.android.support:cardview-v7:$AndroidSupportVersion"
implementation "com.android.support.constraint:constraint-layout:1.0.2"

annotationProcessor "org.androidannotations:androidannotations:$AAVersion"
compile "org.androidannotations:androidannotations-api:$AAVersion"
annotationProcessor 'org.parceler:parceler:1.1.10'
compile 'org.parceler:parceler-api:1.1.10'

compile 'jp.wasabeef:recyclerview-animators:2.3.0'
compile 'net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:2.1.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"

implementation "com.android.support:design:$AndroidSupportVersion"
implementation "com.android.support:appcompat-v7:$AndroidSupportVersion"
implementation "com.android.support:recyclerview-v7:$AndroidSupportVersion"
implementation "com.android.support:preference-v7:$AndroidSupportVersion"
implementation "com.android.support:preference-v14:$AndroidSupportVersion"
implementation "com.android.support:cardview-v7:$AndroidSupportVersion"
implementation "com.android.support.constraint:constraint-layout:1.1.0"

implementation "android.arch.lifecycle:runtime:${ArchVersion}"
implementation "android.arch.lifecycle:extensions:${ArchVersion}"
kapt "android.arch.lifecycle:compiler:${ArchVersion}"

kapt "org.androidannotations:androidannotations:$AAVersion"
implementation "org.androidannotations:androidannotations-api:$AAVersion"

implementation "com.mikepenz:itemanimators:1.0.2@aar"
implementation 'net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:2.1.0'
}
12 changes: 6 additions & 6 deletions app/src/main/assets/basic_cards.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
"mod_basic_plus_2": {
"deck": "basic"
},
"mod_basic_miss_shuffle": {
"mod_basic_null_shuffle": {
"deck": "basic",
"special": "shuffle"
},
"mod_basic_x2_shuffle": {
"mod_basic_double_shuffle": {
"deck": "basic",
"special": "shuffle"
},
"mod_extra_bless_remove": {
"mod_extra_double_bless_remove": {
"deck": "extra",
"special": "remove"
},
"mod_extra_curse_remove": {
"mod_extra_null_curse_remove": {
"deck": "extra",
"special": "remove"
},
Expand Down Expand Up @@ -55,10 +55,10 @@
"card_id": "mod_basic_plus_2"
},
{
"card_id": "mod_basic_miss_shuffle"
"card_id": "mod_basic_null_shuffle"
},
{
"card_id": "mod_basic_x2_shuffle"
"card_id": "mod_basic_double_shuffle"
}
]
}
20 changes: 0 additions & 20 deletions app/src/main/assets/characters.json

This file was deleted.

167 changes: 0 additions & 167 deletions app/src/main/assets/class_brute.json

This file was deleted.

Loading

0 comments on commit 1aeba71

Please sign in to comment.