Develop

Famicoco/app/build.gradle

@@ -39,11 +39,11 @@ dependencies {
     //noinspection GradleCompatible
     implementation files('libs/socketio.jar')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.firebase:firebase-messaging:17.3.4'
-    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
+    implementation 'com.google.firebase:firebase-messaging:20.0.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.14.1'
     testImplementation 'junit:junit:4.12'
     implementation 'com.jakewharton:butterknife:8.4.0'
 }

Famicoco/app/src/main/AndroidManifest.xml

@@ -28,7 +28,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.example.mito.famicoco.SOTOTalkActivity"
+            android:name="com.example.mito.famicoco.SotoTalkActivity"
             android:screenOrientation="portrait" />
 
         <!-- [START firebase_service] -->

Famicoco/app/src/main/java/com/example/mito/famicoco/IEFragment.kt → Famicoco/app/src/main/java/com/example/mito/famicoco/IeFragment.kt

@@ -31,7 +31,7 @@ import java.util.ArrayList
 import java.util.Timer
 import java.util.TimerTask
 
-class IEFragment : Fragment(), CustomListView.OnKeyboardAppearedListener { // いえここ用のフラグメント
+class IeFragment : Fragment(), CustomListView.OnKeyboardAppearedListener { // いえここ用のフラグメント
     private var adapter: TalkCustomAdapter? = null
     private var mTimer: Timer? = null
     private var mHandler: Handler? = null
@@ -285,12 +285,12 @@ constructor(json: JSONObject) {
 
     init {
         when (name) {
-            "しゅり" -> this.icon = IEFragment.icon[0]
-            "しゅうき" -> this.icon = IEFragment.icon[1]
-            "お母さん" -> this.icon = IEFragment.icon[2]
-            "お父さん" -> this.icon = IEFragment.icon[3]
-            "かん爺" -> this.icon = IEFragment.icon[4]
-            else -> this.icon = IEFragment.icon[5]
+            "しゅり" -> this.icon = IeFragment.icon[0]
+            "しゅうき" -> this.icon = IeFragment.icon[1]
+            "お母さん" -> this.icon = IeFragment.icon[2]
+            "お父さん" -> this.icon = IeFragment.icon[3]
+            "かん爺" -> this.icon = IeFragment.icon[4]
+            else -> this.icon = IeFragment.icon[5]
         }
     }
 

Famicoco/app/src/main/java/com/example/mito/famicoco/MainActivity.kt

@@ -348,9 +348,9 @@ class MainActivity : AppCompatActivity() {
             // Return a PlaceholderFragment (defined as a static inner class below).
             when (position) {
                 0 -> return TLFragment()
-                1 -> return IEFragment()
-                2 -> return SOTOFragment()
-                3 -> return PETFragment()
+                1 -> return IeFragment()
+                2 -> return SotoFragment()
+                3 -> return PetFragment()
             }
             return null
         }

Famicoco/app/src/main/java/com/example/mito/famicoco/PETFragment.kt → Famicoco/app/src/main/java/com/example/mito/famicoco/PetFragment.kt

@@ -20,7 +20,7 @@ import java.net.MalformedURLException
 import java.net.URL
 import java.util.ArrayList
 
-class PETFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener {
+class PetFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener {
 
     private lateinit var adapter: CustomAdapter
 

Famicoco/app/src/main/java/com/example/mito/famicoco/SOTOFragment.kt → Famicoco/app/src/main/java/com/example/mito/famicoco/SotoFragment.kt

@@ -25,7 +25,7 @@ import java.util.HashMap
 import java.util.Timer
 import java.util.TimerTask
 
-class SOTOFragment : Fragment() { // そとここ用のクラス
+class SotoFragment : Fragment() { // そとここ用のクラス
     @BindView(R.id.soto_listview)
     internal lateinit var sotoListView: ListView
 
@@ -87,7 +87,7 @@ class SOTOFragment : Fragment() { // そとここ用のクラス
         sotoListView.onItemClickListener = AdapterView.OnItemClickListener { _, _, pos, _ ->
             val intent = Intent(
                     activity,
-                    SOTOTalkActivity::class.java
+                    SotoTalkActivity::class.java
             )
             intent.putExtra(
                     "list",

Famicoco/app/src/main/java/com/example/mito/famicoco/SOTOTalkActivity.kt → Famicoco/app/src/main/java/com/example/mito/famicoco/SotoTalkActivity.kt

@@ -26,7 +26,7 @@ import java.util.ArrayList
 import java.util.Timer
 import java.util.TimerTask
 
-class SOTOTalkActivity : AppCompatActivity(), CustomListView.OnKeyboardAppearedListener { // そとここのリストを押したときに呼ばれるトーク画面用Activity
+class SotoTalkActivity : AppCompatActivity(), CustomListView.OnKeyboardAppearedListener { // そとここのリストを押したときに呼ばれるトーク画面用Activity
 
     @BindView(R.id.soto_talk_listview)
     internal lateinit var listView: CustomListView
@@ -81,13 +81,13 @@ class SOTOTalkActivity : AppCompatActivity(), CustomListView.OnKeyboardAppearedL
             for (j in 0 until m) {
                 select.get(j)
                 when (j) {
-                    0 -> imageView1.setImageBitmap(IEFragment.judge(select.get(0)))
-                    1 -> imageView2.setImageBitmap(IEFragment.judge(select.get(1)))
-                    2 -> imageView3.setImageBitmap(IEFragment.judge(select.get(2)))
-                    3 -> imageView4.setImageBitmap(IEFragment.judge(select.get(3)))
-                    4 -> imageView5.setImageBitmap(IEFragment.judge(select.get(4)))
-                    5 -> imageView5.setImageBitmap(IEFragment.judge(select.get(5)))
-                    else -> imageView6.setImageBitmap(IEFragment.judge(select.get(6)))
+                    0 -> imageView1.setImageBitmap(IeFragment.judge(select.get(0)))
+                    1 -> imageView2.setImageBitmap(IeFragment.judge(select.get(1)))
+                    2 -> imageView3.setImageBitmap(IeFragment.judge(select.get(2)))
+                    3 -> imageView4.setImageBitmap(IeFragment.judge(select.get(3)))
+                    4 -> imageView5.setImageBitmap(IeFragment.judge(select.get(4)))
+                    5 -> imageView5.setImageBitmap(IeFragment.judge(select.get(5)))
+                    else -> imageView6.setImageBitmap(IeFragment.judge(select.get(6)))
                 }
             }
         } catch (e: JSONException) {

Famicoco/app/src/main/res/layout/activity_sototalk.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.example.mito.famicoco.SOTOTalkActivity"
+    tools:context="com.example.mito.famicoco.SotoTalkActivity"
     android:background="@color/White"
     android:focusableInTouchMode="true">
 

Famicoco/app/src/main/res/layout/fragment_ie.xml

@@ -7,7 +7,7 @@
     android:background="@color/White"
     android:focusable="true"
     android:focusableInTouchMode="true"
-    tools:context="com.example.mito.famicoco.IEFragment">
+    tools:context="com.example.mito.famicoco.IeFragment">
 
     <!-- TODO: Update blank fragment layout -->
 

Famicoco/app/src/main/res/layout/fragment_pet.xml

@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.example.mito.famicoco.PETFragment"
+    tools:context="com.example.mito.famicoco.PetFragment"
     android:background="@color/White"
     android:padding="10dp">
 

Famicoco/app/src/main/res/layout/fragment_soto.xml

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/White"
-    tools:context="com.example.mito.famicoco.SOTOFragment"
+    tools:context="com.example.mito.famicoco.SotoFragment"
     android:id="@+id/sotococo_fragment">
 
     <!-- TODO: Update blank fragment layout -->

Famicoco/build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.11'
+    ext.kotlin_version = '1.3.50'
     repositories {
         jcenter()
         mavenCentral()
@@ -12,7 +12,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:3.5.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // Add this line
-        classpath 'com.google.gms:google-services:4.2.0'
+        classpath 'com.google.gms:google-services:4.3.2'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }