Skip to content

Commit

Permalink
alpha 2
Browse files Browse the repository at this point in the history 
- added boards
- added dark theme
- bug fixes
  • Loading branch information
@shamo42
shamo42 committed Jul 30, 2018
1 parent ccc3f4c commit 9306d54
Show file tree
Hide file tree
Showing 39 changed files with 667 additions and 198 deletions.
52 changes: 29 additions & 23 deletions app/app.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</option>
<option name="pluginClasspaths">
<array>
<option value="$MODULE_DIR$/../../../.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-annotation-processing-gradle/1.2.41/870d8f3b110200303a07d4bbfc7bf9066669203b/kotlin-annotation-processing-gradle-1.2.41.jar" />
<option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-annotation-processing-gradle/1.2.51/8cd0f527d68195e3c008302744ad319d24499cd7/kotlin-annotation-processing-gradle-1.2.51.jar" />
</array>
</option>
</compilerArguments>
Expand All @@ -54,18 +54,18 @@
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/data_binding_base_class_source_out/debug/dataBindingGenBaseClassesDebug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugAndroidTest" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" />
Expand Down Expand Up @@ -117,15 +117,20 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkReleaseClasspath" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/data-binding" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/data_binding_base_class_log_artifact" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/data_binding_base_class_logs_dependency_artifacts" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/data_binding_dependency_artifacts" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/data_binding_layout_info_type_merge" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/feature_data_binding_base_feature_info" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/navigation-args" />
Expand All @@ -146,60 +151,61 @@
</content>
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Gradle: android.arch.persistence.room:runtime-1.1.1-rc1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.paging:common:1.0.1@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-v4-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.databinding:library-3.3.0-alpha03" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.moshi:moshi:1.6.0@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.navigation:navigation-runtime-1.0.0-alpha02" level="project" />
<orderEntry type="library" name="Gradle: android.arch.navigation:navigation-runtime-1.0.0-alpha04" level="project" />
<orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxjava:2.1.12@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.databinding:adapters-3.2.0-alpha17" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.4.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.persistence:db-framework-1.1.1-rc1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.persistence.room:common:1.1.1-rc1@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.1@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-1.1.2" level="project" />
<orderEntry type="library" name="Gradle: android.arch.persistence:db-framework-1.1.1" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-1.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
<orderEntry type="library" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.persistence.room:rxjava2-1.1.1-rc1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-1.1.1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:design-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.navigation:navigation-ui-1.0.0-alpha02" level="project" />
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.2@jar" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:adapter-rxjava2:2.4.0@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.navigation:navigation-ui-1.0.0-alpha04" level="project" />
<orderEntry type="library" name="Gradle: com.google.dagger:dagger-android-2.15" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:transition-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:reactivestreams-1.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.google.dagger:dagger:2.15@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.persistence.room:rxjava2-1.1.1" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.51@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.1@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.databinding:library-3.2.0-alpha17" level="project" />
<orderEntry type="library" name="Gradle: com.android.databinding:adapters-3.3.0-alpha03" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:cardview-v7-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.paging:runtime-1.0.0" level="project" />
<orderEntry type="library" name="Gradle: android.arch.persistence:db-1.1.1-rc1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.paging:runtime-1.0.1" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.2.51@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.1" level="project" />
<orderEntry type="library" name="Gradle: org.reactivestreams:reactive-streams:1.0.2@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.navigation:navigation-fragment-1.0.0-alpha02" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.41@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-moshi:2.3.0@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.navigation:navigation-fragment-1.0.0-alpha04" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.41@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:extensions-1.1.1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
<orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxandroid-2.0.2" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.51@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.persistence.room:runtime-1.1.1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.persistence:db-1.1.1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.persistence.room:common:1.1.1@jar" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.10.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.databinding:baseLibrary:3.2.0-alpha17@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.paging:common:1.0.0@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.google.dagger:dagger-android-support-2.15" level="project" />
<orderEntry type="library" name="Gradle: android.arch.navigation:navigation-common-1.0.0-alpha02" level="project" />
<orderEntry type="library" name="Gradle: android.arch.navigation:navigation-common-1.0.0-alpha04" level="project" />
<orderEntry type="library" name="Gradle: com.android.databinding:baseLibrary:3.3.0-alpha03@jar" level="project" />
</component>
</module>
10 changes: 5 additions & 5 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ android {
applicationId "com.kyoapps.maniac"
minSdkVersion 19
targetSdkVersion 27
versionCode 1
versionName "3.0.0"
versionCode 2
versionName "3.0.0 alpha 2"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

Expand Down Expand Up @@ -59,9 +59,9 @@ dependencies {
implementation "android.arch.lifecycle:extensions:$rootProject.architectureComponentsVersion"
implementation "android.arch.lifecycle:reactivestreams:$rootProject.architectureComponentsVersion"
kapt "android.arch.lifecycle:compiler:$rootProject.architectureComponentsVersion"
implementation "android.arch.persistence.room:runtime:$rootProject.architectureComponentsVersionRoom"
kapt "android.arch.persistence.room:compiler:$rootProject.architectureComponentsVersionRoom"
implementation "android.arch.persistence.room:rxjava2:$rootProject.architectureComponentsVersionRoom"
implementation "android.arch.persistence.room:runtime:$rootProject.architectureComponentsVersion"
kapt "android.arch.persistence.room:compiler:$rootProject.architectureComponentsVersion"
implementation "android.arch.persistence.room:rxjava2:$rootProject.architectureComponentsVersion"

// RxJava
implementation "io.reactivex.rxjava2:rxandroid:$rootProject.rxandroidVersion"
Expand Down
Binary file modified app/release/app-release.apk
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion app/release/output.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"3.0.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"3.0.0 alpha 2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:theme="@style/AppCompat.Night"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name="com.kyoapps.maniac.ui.MainActivity">
<intent-filter>
Expand Down
Binary file added app/src/main/assets/images/spoiler.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/assets/images/transparent.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/assets/user.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/src/main/java/com/kyoapps/maniac/api/ManiacApiLEGACY.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ import retrofit2.http.*
//todo replace with new api
interface ManiacApiLEGACY {

@GET("pxmboard.php")
fun getBoards(
): Single<Response<ResponseBody>>

@GET("pxmboard.php")
fun getThreads(
@Query("mode") threadlist: String,
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/kyoapps/maniac/functions/FuncFetch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ object FuncFetch {
}

fun fetchReplies(mainDS: MainDS, loadRequestItem: LoadRequestItem) {
if (loadRequestItem.thrdid != -1) {
if (loadRequestItem.thrdid != null && loadRequestItem.thrdid != -1) {
compositeDisposable.add(mainDS.fetchRepliesIntoDb(loadRequestItem.brdid, loadRequestItem.thrdid)
.subscribeOn(Schedulers.newThread())
.subscribe({result -> Log.i(TAG, "fetchReplies success $result") },
Expand Down
Loading

0 comments on commit 9306d54

Please sign in to comment.