Merge pull request #72 from NUmeroAndDev/develop

Ver 8.0.0

.gitattributes

@@ -0,0 +1 @@
+/app/src/main/assets/licenses.html linguist-vendored

README.md

@@ -1,23 +1,21 @@
 
 #  SojoDia  
-![Android Studio](https://img.shields.io/badge/Android%20Studio-3.1.2-green.svg)
-![Kotlin](https://img.shields.io/badge/kotlin-1.2.41-yellow.svg)
+![Android Studio](https://img.shields.io/badge/Android%20Studio-3.2%20beta2-green.svg)
+![Kotlin](https://img.shields.io/badge/kotlin-1.2.50-yellow.svg)
 
 ## About  
 関西大学高槻キャンパス用のバス時刻表アプリ  
 [Google Play](https://play.google.com/store/apps/details?id=com.numero.sojodia)  
 
 ### Support  
-API Level 17 ( Android 4.2 )  
+API Level 19 ( Android 4.4 )
 
 ### Libraries  
 |Library|Version|
 |:-----------|:-----------|
 |[RxJava](https://github.com/ReactiveX/RxJava)|2.1.7|
 |[RxAndroid](https://github.com/ReactiveX/RxAndroid)|2.0.2|
 |[OkHttp](https://github.com/square/okhttp)|3.9.0|
-|[Dagger](https://github.com/google/dagger)|2.15|
-|[Kotshi](https://github.com/ansman/kotshi)|1.0.2|
-|[Retrofit](https://github.com/square/retrofit)|2.3.0|
-|[Android-ktx](https://github.com/android/android-ktx)|0.3|
+|[Kotshi](https://github.com/ansman/kotshi)|1.0.4|
+|[Retrofit](https://github.com/square/retrofit)|2.4.0|
 |[Android License Tools Plugin](https://github.com/cookpad/license-tools-plugin)|1.2.0|

app/build.gradle

@@ -8,25 +8,24 @@ apply plugin: 'kotlin-kapt'
 
 apply plugin: 'com.cookpad.android.licensetools'
 
-def versionMajor = 7
-def versionMinor = 2
+def versionMajor = 8
+def versionMinor = 0
 def versionPatch = 0
-def versionBuild = 0
+def versionBuild = 4
 def targetDevice = 0
 
 def appVersionCode = versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild * 10 + targetDevice
 def appVersionName = "${versionMajor}.${versionMinor}.${versionPatch}"
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.numero.sojodia"
-        minSdkVersion 17
-        targetSdkVersion 27
+        minSdkVersion 19
+        targetSdkVersion 28
         versionCode appVersionCode
         versionName appVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         buildConfigField("String", "BUS_DATA_URL", "\"https://raw.githubusercontent.com\"")
     }
@@ -58,16 +57,18 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'androidx.test:runner:1.1.0-alpha1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha1'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "androidx.core:core-ktx:$ktx_version"
+    implementation "androidx.core:core-ktx:1.0.0-alpha3"
 
-    implementation "com.android.support:design:$support_library_version"
-    implementation "com.android.support:appcompat-v7:$support_library_version"
-    implementation "com.android.support:recyclerview-v7:$support_library_version"
-    implementation "com.android.support:cardview-v7:$support_library_version"
+    implementation 'com.google.android.material:material:1.0.0-alpha3'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.1'
+
+    implementation 'androidx.appcompat:appcompat:1.0.0-alpha3'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0-alpha3'
+    implementation 'androidx.preference:preference:1.0.0-alpha3'
 
     implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
     implementation "com.squareup.okhttp3:logging-interceptor:$okhttp_version"
@@ -81,10 +82,4 @@ dependencies {
     implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
     implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit_version"
     implementation "com.squareup.retrofit2:converter-moshi:$retrofit_version"
-
-    implementation "com.google.dagger:dagger:$dagger_version"
-    implementation "com.google.dagger:dagger-android:$dagger_version"
-    implementation "com.google.dagger:dagger-android-support:$dagger_version"
-    kapt "com.google.dagger:dagger-compiler:$dagger_version"
-    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
 }

app/licenses.yml

@@ -1,8 +1,127 @@
-# SupportLibrary
-- artifact: com.android.support:+:+
-  name: Android Support Libraries
+# AndroidX
+- artifact: androidx.core:core:+
+  name: Android Support Library compat
   copyrightHolder: The Android Open Source Project
-  license: apache2
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
+- artifact: androidx.drawerlayout:drawerlayout:+
+  name: Android Support Library Drawer Layout
+  skip: true
+- artifact: androidx.documentfile:documentfile:+
+  name: Android Support Library Document File
+  skip: true
+- artifact: androidx.interpolator:interpolator:+
+  name: Android Support Library Interpolators
+  skip: true
+- artifact: androidx.vectordrawable:vectordrawable:+
+  name: Android Support VectorDrawable
+  skip: true
+- artifact: androidx.legacy:legacy-support-core-ui:+
+  name: Android Support Library core UI
+  skip: true
+- artifact: androidx.arch.core:core-runtime:+
+  name: Android Arch-Runtime
+  skip: true
+- artifact: androidx.lifecycle:lifecycle-common:+
+  name: Android Lifecycle-Common
+  skip: true
+- artifact: androidx.viewpager:viewpager:+
+  name: Android Support Library View Pager
+  skip: true
+- artifact: androidx.transition:transition:+
+  name: Android Transition Support Library
+  skip: true
+- artifact: androidx.print:print:+
+  name: Android Support Library Print
+  skip: true
+- artifact: androidx.arch.core:core-common:+
+  name: Android Arch-Common
+  skip: true
+- artifact: androidx.loader:loader:+
+  name: Android Support Library loader
+  skip: true
+- artifact: androidx.lifecycle:lifecycle-runtime:+
+  name: Android Lifecycle Runtime
+  skip: true
+- artifact: androidx.annotation:annotation:+
+  name: Android Support Library Annotations
+  skip: true
+- artifact: androidx.swiperefreshlayout:swiperefreshlayout:+
+  name: Android Support Library Custom View
+  skip: true
+- artifact: androidx.slidingpanelayout:slidingpanelayout:+
+  name: Android Support Library Sliding Pane Layout
+  skip: true
+- artifact: androidx.cardview:cardview:+
+  name: Android Support CardView v7
+  skip: true
+- artifact: androidx.legacy:legacy-support-core-utils:+
+  name: Android Support Library core utils
+  skip: true
+- artifact: androidx.lifecycle:lifecycle-livedata-core:+
+  name: Android Lifecycle LiveData Core
+  skip: true
+- artifact: androidx.preference:preference:+
+  name: Android Support Preference v7
+  skip: true
+- artifact: androidx.fragment:fragment:+
+  name: Android Support Library fragment
+  skip: true
+- artifact: androidx.cursoradapter:cursoradapter:+
+  name: Android Support Library Cursor Adapter
+  skip: true
+- artifact: androidx.asynclayoutinflater:asynclayoutinflater:+
+  name: Android Support Library Async Layout Inflater
+  skip: true
+- artifact: androidx.vectordrawable:vectordrawable-animated:+
+  name: Android Support AnimatedVectorDrawable
+  skip: true
+- artifact: androidx.customview:customview:+
+  name: Android Support Library Custom View
+  skip: true
+- artifact: androidx.lifecycle:lifecycle-viewmodel:+
+  name: Android Lifecycle ViewModel
+  skip: true
+- artifact: androidx.recyclerview:recyclerview:+
+  name: Android Support RecyclerView v7
+  skip: true
+- artifact: androidx.collection:collection:+
+  name: Android Support Library collections
+  skip: true
+- artifact: androidx.appcompat:appcompat:+
+  name: Android AppCompat Library v7
+  skip: true
+- artifact: androidx.coordinatorlayout:coordinatorlayout:+
+  name: Android Support Library Coordinator Layout
+  skip: true
+- artifact: androidx.localbroadcastmanager:localbroadcastmanager:+
+  name: Android Support Library Local Broadcast Manager
+  skip: true
+
+- artifact: androidx.core:core-ktx:+
+  name: Android KTX Core
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: https://github.com/android/android-ktx
+
+- artifact: androidx.constraintlayout:constraintlayout:+
+  name: Android ConstraintLayout
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://tools.android.com
+- artifact: androidx.constraintlayout:constraintlayout-solver:+
+  name: Android ConstraintLayout Solver
+  skip: true
+
+- artifact: com.google.android.material:material:+
+  name: Material Components for Android
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
 
 # Kotlin
 - artifact: org.jetbrains.kotlin:kotlin-stdlib:+
@@ -18,20 +137,6 @@
 - artifact: org.jetbrains.kotlin:kotlin-stdlib-jre7:+
   skip: true
 
-# arch
-- artifact: android.arch.core:common:+
-  skip: true
-- artifact: android.arch.lifecycle:common:+
-  skip: true
-- artifact: android.arch.lifecycle:runtime:+
-  skip: true
-- artifact: android.arch.lifecycle:viewmodel:+
-  skip: true
-- artifact: android.arch.core:runtime:+
-  skip: true
-- artifact: android.arch.lifecycle:livedata-core:+
-  skip: true
-
 # Okhttp
 - artifact: com.squareup.okhttp3:okhttp:+
   name: OkHttp
@@ -60,20 +165,6 @@
 - artifact: org.reactivestreams:reactive-streams:+
   skip: true
 
-# Dagger
-- artifact: com.google.dagger:dagger:+
-  name: Dagger
-  copyrightHolder: The Dagger Authors
-  license: Apache 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/google/dagger
-- artifact: com.google.dagger:dagger-android:+
-  skip: true
-- artifact: com.google.dagger:dagger-android-support:+
-  skip: true
-- artifact: javax.inject:javax.inject:+
-  skip: true
-
 # Retrofit
 - artifact: com.squareup.retrofit2:retrofit:+
   name: Retrofit
@@ -96,12 +187,4 @@
 - artifact: com.squareup.moshi:moshi:+
   name: Moshi
   copyrightHolder: Square, Inc.
-  license: Apache 2.0
-
-# Android-ktx
-- artifact: androidx.core:core-ktx:+
-  name: Android KTX Core
-  copyrightHolder: The Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/android/android-ktx
+  license: Apache 2.0

app/proguard-rules.pro

@@ -1,18 +1,9 @@
+# Okhttp
 -dontwarn okhttp3.**
 -dontwarn okio.**
-
-# RxJava
--dontwarn sun.misc.**
--keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* {
-   long producerIndex;
-   long consumerIndex;
-}
--keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueProducerNodeRef {
-    rx.internal.util.atomic.LinkedQueueNode producerNode;
-}
--keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueConsumerNodeRef {
-    rx.internal.util.atomic.LinkedQueueNode consumerNode;
-}
+-dontwarn javax.annotation.**
+-dontwarn org.conscrypt.**
+-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
 
 # Retrofit
 -keepattributes Signature
@@ -32,8 +23,4 @@
     public <methods>;
 }
 
-# Dagger
--keep class com.google.errorprone.annotations.** { *; }
--dontwarn com.google.errorprone.annotations.**
-
 -keep class com.numero.sojodia.model.** { *; }

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.numero.sojodia">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -11,8 +12,9 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:resizeableActivity="false"
-        android:theme="@style/AppTheme">
+        android:roundIcon="@mipmap/ic_launcher"
+        android:theme="@style/AppTheme"
+        tools:ignore="GoogleAppIndexingWarning">
 
         <activity
             android:name=".activity.MainActivity"