diff --git a/Famicoco/.idea/caches/build_file_checksums.ser b/Famicoco/.idea/caches/build_file_checksums.ser index 04e077d..da74d50 100644 Binary files a/Famicoco/.idea/caches/build_file_checksums.ser and b/Famicoco/.idea/caches/build_file_checksums.ser differ diff --git a/Famicoco/.idea/caches/gradle_models.ser b/Famicoco/.idea/caches/gradle_models.ser index 5fe0eb4..1b32f3a 100644 Binary files a/Famicoco/.idea/caches/gradle_models.ser and b/Famicoco/.idea/caches/gradle_models.ser differ diff --git a/Famicoco/app/build.gradle b/Famicoco/app/build.gradle index fb9847b..2b44a6e 100644 --- a/Famicoco/app/build.gradle +++ b/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' } diff --git a/Famicoco/app/src/main/AndroidManifest.xml b/Famicoco/app/src/main/AndroidManifest.xml index 526c465..438438d 100644 --- a/Famicoco/app/src/main/AndroidManifest.xml +++ b/Famicoco/app/src/main/AndroidManifest.xml @@ -28,7 +28,7 @@ diff --git a/Famicoco/app/src/main/java/com/example/mito/famicoco/IEFragment.kt b/Famicoco/app/src/main/java/com/example/mito/famicoco/IeFragment.kt similarity index 96% rename from Famicoco/app/src/main/java/com/example/mito/famicoco/IEFragment.kt rename to Famicoco/app/src/main/java/com/example/mito/famicoco/IeFragment.kt index fb4ace8..253e4fe 100644 --- a/Famicoco/app/src/main/java/com/example/mito/famicoco/IEFragment.kt +++ b/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] } } diff --git a/Famicoco/app/src/main/java/com/example/mito/famicoco/MainActivity.kt b/Famicoco/app/src/main/java/com/example/mito/famicoco/MainActivity.kt index 56aefd5..79ca8c1 100644 --- a/Famicoco/app/src/main/java/com/example/mito/famicoco/MainActivity.kt +++ b/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 } diff --git a/Famicoco/app/src/main/java/com/example/mito/famicoco/PETFragment.kt b/Famicoco/app/src/main/java/com/example/mito/famicoco/PetFragment.kt similarity index 98% rename from Famicoco/app/src/main/java/com/example/mito/famicoco/PETFragment.kt rename to Famicoco/app/src/main/java/com/example/mito/famicoco/PetFragment.kt index d8613fd..c00666d 100644 --- a/Famicoco/app/src/main/java/com/example/mito/famicoco/PETFragment.kt +++ b/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 diff --git a/Famicoco/app/src/main/java/com/example/mito/famicoco/SOTOFragment.kt b/Famicoco/app/src/main/java/com/example/mito/famicoco/SotoFragment.kt similarity index 98% rename from Famicoco/app/src/main/java/com/example/mito/famicoco/SOTOFragment.kt rename to Famicoco/app/src/main/java/com/example/mito/famicoco/SotoFragment.kt index 563e1c8..dd007e4 100644 --- a/Famicoco/app/src/main/java/com/example/mito/famicoco/SOTOFragment.kt +++ b/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", diff --git a/Famicoco/app/src/main/java/com/example/mito/famicoco/SOTOTalkActivity.kt b/Famicoco/app/src/main/java/com/example/mito/famicoco/SotoTalkActivity.kt similarity index 95% rename from Famicoco/app/src/main/java/com/example/mito/famicoco/SOTOTalkActivity.kt rename to Famicoco/app/src/main/java/com/example/mito/famicoco/SotoTalkActivity.kt index 8d6a524..9419de2 100644 --- a/Famicoco/app/src/main/java/com/example/mito/famicoco/SOTOTalkActivity.kt +++ b/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) { diff --git a/Famicoco/app/src/main/res/layout/activity_sototalk.xml b/Famicoco/app/src/main/res/layout/activity_sototalk.xml index 1e3b696..fa5d0fd 100644 --- a/Famicoco/app/src/main/res/layout/activity_sototalk.xml +++ b/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"> diff --git a/Famicoco/app/src/main/res/layout/fragment_ie.xml b/Famicoco/app/src/main/res/layout/fragment_ie.xml index fa5753c..ebc170a 100644 --- a/Famicoco/app/src/main/res/layout/fragment_ie.xml +++ b/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"> diff --git a/Famicoco/app/src/main/res/layout/fragment_pet.xml b/Famicoco/app/src/main/res/layout/fragment_pet.xml index b14b32e..bbe13ef 100644 --- a/Famicoco/app/src/main/res/layout/fragment_pet.xml +++ b/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"> diff --git a/Famicoco/app/src/main/res/layout/fragment_soto.xml b/Famicoco/app/src/main/res/layout/fragment_soto.xml index ffd0a41..2f5d7d3 100644 --- a/Famicoco/app/src/main/res/layout/fragment_soto.xml +++ b/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"> diff --git a/Famicoco/build.gradle b/Famicoco/build.gradle index 698992a..171013f 100644 --- a/Famicoco/build.gradle +++ b/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 } diff --git a/MyApplication/.gitignore b/MyApplication/.gitignore deleted file mode 100644 index 5edb4ee..0000000 --- a/MyApplication/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -.DS_Store -/build -/captures -.externalNativeBuild diff --git a/MyApplication/.idea/caches/build_file_checksums.ser b/MyApplication/.idea/caches/build_file_checksums.ser deleted file mode 100644 index 569b972..0000000 Binary files a/MyApplication/.idea/caches/build_file_checksums.ser and /dev/null differ diff --git a/MyApplication/.idea/codeStyles/Project.xml b/MyApplication/.idea/codeStyles/Project.xml deleted file mode 100644 index 30aa626..0000000 --- a/MyApplication/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MyApplication/.idea/dictionaries/mito.xml b/MyApplication/.idea/dictionaries/mito.xml deleted file mode 100644 index 89d8ff8..0000000 --- a/MyApplication/.idea/dictionaries/mito.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/MyApplication/.idea/encodings.xml b/MyApplication/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/MyApplication/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/MyApplication/.idea/gradle.xml b/MyApplication/.idea/gradle.xml deleted file mode 100644 index 7ac24c7..0000000 --- a/MyApplication/.idea/gradle.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/MyApplication/.idea/misc.xml b/MyApplication/.idea/misc.xml deleted file mode 100644 index 99202cc..0000000 --- a/MyApplication/.idea/misc.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/MyApplication/.idea/runConfigurations.xml b/MyApplication/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/MyApplication/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/MyApplication/.idea/saveactions_settings.xml b/MyApplication/.idea/saveactions_settings.xml deleted file mode 100644 index 7cf45e2..0000000 --- a/MyApplication/.idea/saveactions_settings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/MyApplication/app/.gitignore b/MyApplication/app/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/MyApplication/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/MyApplication/app/build.gradle b/MyApplication/app/build.gradle deleted file mode 100644 index a3d54f2..0000000 --- a/MyApplication/app/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.application' - -apply plugin: 'kotlin-android' - -apply plugin: 'kotlin-android-extensions' - -android { - compileSdkVersion 27 - defaultConfig { - applicationId "com.example.mito.myapplication" - minSdkVersion 22 - targetSdkVersion 27 - versionCode 1 - versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" - implementation 'com.android.support:appcompat-v7:27.0.2' - implementation 'com.android.support.constraint:constraint-layout:1.0.2' - 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' -} diff --git a/MyApplication/app/proguard-rules.pro b/MyApplication/app/proguard-rules.pro deleted file mode 100644 index f1b4245..0000000 --- a/MyApplication/app/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/MyApplication/app/src/androidTest/java/com/example/mito/myapplication/ExampleInstrumentedTest.kt b/MyApplication/app/src/androidTest/java/com/example/mito/myapplication/ExampleInstrumentedTest.kt deleted file mode 100644 index 67677ea..0000000 --- a/MyApplication/app/src/androidTest/java/com/example/mito/myapplication/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.mito.myapplication - -import android.support.test.InstrumentationRegistry -import android.support.test.runner.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getTargetContext() - assertEquals("com.example.mito.myapplication", appContext.packageName) - } -} diff --git a/MyApplication/app/src/main/AndroidManifest.xml b/MyApplication/app/src/main/AndroidManifest.xml deleted file mode 100644 index 08c9385..0000000 --- a/MyApplication/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MyApplication/app/src/main/java/com/example/mito/myapplication/MainActivity.kt b/MyApplication/app/src/main/java/com/example/mito/myapplication/MainActivity.kt deleted file mode 100644 index 8ad8c0d..0000000 --- a/MyApplication/app/src/main/java/com/example/mito/myapplication/MainActivity.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.example.mito.myapplication - -import android.os.Bundle -import android.support.v7.app.AppCompatActivity - -class MainActivity : AppCompatActivity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - } -} diff --git a/MyApplication/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/MyApplication/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index c3903ed..0000000 --- a/MyApplication/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - diff --git a/MyApplication/app/src/main/res/drawable/ic_launcher_background.xml b/MyApplication/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 5713f34..0000000 --- a/MyApplication/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MyApplication/app/src/main/res/layout/activity_main.xml b/MyApplication/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 7539a01..0000000 --- a/MyApplication/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/MyApplication/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/MyApplication/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index bbd3e02..0000000 --- a/MyApplication/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/MyApplication/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/MyApplication/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index bbd3e02..0000000 --- a/MyApplication/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/MyApplication/app/src/main/res/mipmap-hdpi/ic_launcher.png b/MyApplication/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index a2f5908..0000000 Binary files a/MyApplication/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/MyApplication/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/MyApplication/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 1b52399..0000000 Binary files a/MyApplication/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/MyApplication/app/src/main/res/mipmap-mdpi/ic_launcher.png b/MyApplication/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index ff10afd..0000000 Binary files a/MyApplication/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/MyApplication/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/MyApplication/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 115a4c7..0000000 Binary files a/MyApplication/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/MyApplication/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/MyApplication/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index dcd3cd8..0000000 Binary files a/MyApplication/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/MyApplication/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/MyApplication/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 459ca60..0000000 Binary files a/MyApplication/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/MyApplication/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/MyApplication/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 8ca12fe..0000000 Binary files a/MyApplication/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/MyApplication/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/MyApplication/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 8e19b41..0000000 Binary files a/MyApplication/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/MyApplication/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/MyApplication/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index b824ebd..0000000 Binary files a/MyApplication/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/MyApplication/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/MyApplication/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 4c19a13..0000000 Binary files a/MyApplication/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/MyApplication/app/src/main/res/values/colors.xml b/MyApplication/app/src/main/res/values/colors.xml deleted file mode 100644 index 3ab3e9c..0000000 --- a/MyApplication/app/src/main/res/values/colors.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - #3F51B5 - #303F9F - #FF4081 - diff --git a/MyApplication/app/src/main/res/values/styles.xml b/MyApplication/app/src/main/res/values/styles.xml deleted file mode 100644 index 5885930..0000000 --- a/MyApplication/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/MyApplication/app/src/test/java/com/example/mito/myapplication/ExampleUnitTest.kt b/MyApplication/app/src/test/java/com/example/mito/myapplication/ExampleUnitTest.kt deleted file mode 100644 index 3bd8adc..0000000 --- a/MyApplication/app/src/test/java/com/example/mito/myapplication/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.example.mito.myapplication - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/MyApplication/build.gradle b/MyApplication/build.gradle deleted file mode 100644 index afb1b12..0000000 --- a/MyApplication/build.gradle +++ /dev/null @@ -1,27 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - ext.kotlin_version = '1.2.21' - repositories { - google() - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:3.1.0-beta1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - google() - jcenter() - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} diff --git a/MyApplication/gradle/wrapper/gradle-wrapper.jar b/MyApplication/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7a3265e..0000000 Binary files a/MyApplication/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/MyApplication/gradle/wrapper/gradle-wrapper.properties b/MyApplication/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index df6626d..0000000 --- a/MyApplication/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Fri Feb 02 21:07:49 JST 2018 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/MyApplication/gradlew b/MyApplication/gradlew deleted file mode 100755 index cccdd3d..0000000 --- a/MyApplication/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/MyApplication/gradlew.bat b/MyApplication/gradlew.bat deleted file mode 100644 index f955316..0000000 --- a/MyApplication/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/MyApplication/settings.gradle b/MyApplication/settings.gradle deleted file mode 100644 index e7b4def..0000000 --- a/MyApplication/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app' diff --git a/MyApplication2/.gitignore b/MyApplication2/.gitignore deleted file mode 100644 index 5edb4ee..0000000 --- a/MyApplication2/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -.DS_Store -/build -/captures -.externalNativeBuild diff --git a/MyApplication2/.idea/.name b/MyApplication2/.idea/.name deleted file mode 100644 index b3405b3..0000000 --- a/MyApplication2/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -My Application \ No newline at end of file diff --git a/MyApplication2/.idea/codeStyles/Project.xml b/MyApplication2/.idea/codeStyles/Project.xml deleted file mode 100644 index 30aa626..0000000 --- a/MyApplication2/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MyApplication2/.idea/encodings.xml b/MyApplication2/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/MyApplication2/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/MyApplication2/.idea/gradle.xml b/MyApplication2/.idea/gradle.xml deleted file mode 100644 index 76a4349..0000000 --- a/MyApplication2/.idea/gradle.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/MyApplication2/.idea/misc.xml b/MyApplication2/.idea/misc.xml deleted file mode 100644 index 030f857..0000000 --- a/MyApplication2/.idea/misc.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/MyApplication2/.idea/runConfigurations.xml b/MyApplication2/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/MyApplication2/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/MyApplication2/.idea/saveactions_settings.xml b/MyApplication2/.idea/saveactions_settings.xml deleted file mode 100644 index 7cf45e2..0000000 --- a/MyApplication2/.idea/saveactions_settings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/MyApplication2/app/.gitignore b/MyApplication2/app/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/MyApplication2/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/MyApplication2/app/build.gradle b/MyApplication2/app/build.gradle deleted file mode 100644 index a3d54f2..0000000 --- a/MyApplication2/app/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.application' - -apply plugin: 'kotlin-android' - -apply plugin: 'kotlin-android-extensions' - -android { - compileSdkVersion 27 - defaultConfig { - applicationId "com.example.mito.myapplication" - minSdkVersion 22 - targetSdkVersion 27 - versionCode 1 - versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" - implementation 'com.android.support:appcompat-v7:27.0.2' - implementation 'com.android.support.constraint:constraint-layout:1.0.2' - 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' -} diff --git a/MyApplication2/app/proguard-rules.pro b/MyApplication2/app/proguard-rules.pro deleted file mode 100644 index f1b4245..0000000 --- a/MyApplication2/app/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/MyApplication2/app/src/androidTest/java/com/example/mito/myapplication/ExampleInstrumentedTest.kt b/MyApplication2/app/src/androidTest/java/com/example/mito/myapplication/ExampleInstrumentedTest.kt deleted file mode 100644 index 67677ea..0000000 --- a/MyApplication2/app/src/androidTest/java/com/example/mito/myapplication/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.mito.myapplication - -import android.support.test.InstrumentationRegistry -import android.support.test.runner.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getTargetContext() - assertEquals("com.example.mito.myapplication", appContext.packageName) - } -} diff --git a/MyApplication2/app/src/main/AndroidManifest.xml b/MyApplication2/app/src/main/AndroidManifest.xml deleted file mode 100644 index 08c9385..0000000 --- a/MyApplication2/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MyApplication2/app/src/main/java/com/example/mito/myapplication/MainActivity.kt b/MyApplication2/app/src/main/java/com/example/mito/myapplication/MainActivity.kt deleted file mode 100644 index 2eedac0..0000000 --- a/MyApplication2/app/src/main/java/com/example/mito/myapplication/MainActivity.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.example.mito.myapplication - -import android.support.v7.app.AppCompatActivity -import android.os.Bundle - -class MainActivity : AppCompatActivity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - } -} diff --git a/MyApplication2/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/MyApplication2/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index c3903ed..0000000 --- a/MyApplication2/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - diff --git a/MyApplication2/app/src/main/res/drawable/ic_launcher_background.xml b/MyApplication2/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 5713f34..0000000 --- a/MyApplication2/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MyApplication2/app/src/main/res/layout/activity_main.xml b/MyApplication2/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 7539a01..0000000 --- a/MyApplication2/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/MyApplication2/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/MyApplication2/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index bbd3e02..0000000 --- a/MyApplication2/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/MyApplication2/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/MyApplication2/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index bbd3e02..0000000 --- a/MyApplication2/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/MyApplication2/app/src/main/res/mipmap-hdpi/ic_launcher.png b/MyApplication2/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index a2f5908..0000000 Binary files a/MyApplication2/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/MyApplication2/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/MyApplication2/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 1b52399..0000000 Binary files a/MyApplication2/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/MyApplication2/app/src/main/res/mipmap-mdpi/ic_launcher.png b/MyApplication2/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index ff10afd..0000000 Binary files a/MyApplication2/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/MyApplication2/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/MyApplication2/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 115a4c7..0000000 Binary files a/MyApplication2/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/MyApplication2/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/MyApplication2/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index dcd3cd8..0000000 Binary files a/MyApplication2/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/MyApplication2/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/MyApplication2/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 459ca60..0000000 Binary files a/MyApplication2/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/MyApplication2/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/MyApplication2/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 8ca12fe..0000000 Binary files a/MyApplication2/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/MyApplication2/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/MyApplication2/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 8e19b41..0000000 Binary files a/MyApplication2/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/MyApplication2/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/MyApplication2/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index b824ebd..0000000 Binary files a/MyApplication2/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/MyApplication2/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/MyApplication2/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 4c19a13..0000000 Binary files a/MyApplication2/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/MyApplication2/app/src/main/res/values/colors.xml b/MyApplication2/app/src/main/res/values/colors.xml deleted file mode 100644 index 3ab3e9c..0000000 --- a/MyApplication2/app/src/main/res/values/colors.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - #3F51B5 - #303F9F - #FF4081 - diff --git a/MyApplication2/app/src/main/res/values/styles.xml b/MyApplication2/app/src/main/res/values/styles.xml deleted file mode 100644 index 5885930..0000000 --- a/MyApplication2/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/MyApplication2/app/src/test/java/com/example/mito/myapplication/ExampleUnitTest.kt b/MyApplication2/app/src/test/java/com/example/mito/myapplication/ExampleUnitTest.kt deleted file mode 100644 index 3bd8adc..0000000 --- a/MyApplication2/app/src/test/java/com/example/mito/myapplication/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.example.mito.myapplication - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/MyApplication2/build.gradle b/MyApplication2/build.gradle deleted file mode 100644 index 64eb288..0000000 --- a/MyApplication2/build.gradle +++ /dev/null @@ -1,27 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - ext.kotlin_version = '1.2.21' - repositories { - google() - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:3.2.0-alpha01' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - google() - jcenter() - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} diff --git a/MyApplication2/gradle/wrapper/gradle-wrapper.jar b/MyApplication2/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7a3265e..0000000 Binary files a/MyApplication2/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/MyApplication2/gradle/wrapper/gradle-wrapper.properties b/MyApplication2/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 1f517ab..0000000 --- a/MyApplication2/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Fri Feb 02 21:24:49 JST 2018 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/MyApplication2/gradlew b/MyApplication2/gradlew deleted file mode 100755 index cccdd3d..0000000 --- a/MyApplication2/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/MyApplication2/gradlew.bat b/MyApplication2/gradlew.bat deleted file mode 100644 index f955316..0000000 --- a/MyApplication2/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/MyApplication2/settings.gradle b/MyApplication2/settings.gradle deleted file mode 100644 index e7b4def..0000000 --- a/MyApplication2/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app'