From b23656942de284461a24eed1875199fbd77474d8 Mon Sep 17 00:00:00 2001 From: yoshida0261 Date: Fri, 31 Jan 2020 00:50:50 +0900 Subject: [PATCH 1/3] [WIP] fix #584 From 6852767431550c4ec6178a2a9afb53eb3b83266a Mon Sep 17 00:00:00 2001 From: yoshida0261 Date: Sun, 2 Feb 2020 01:58:53 +0900 Subject: [PATCH 2/3] feat: add about-wifi string --- .../droidkaigi/confsched2020/about/ui/AboutFragment.kt | 5 +++++ feature/about/src/main/res/values-ja/strings.xml | 1 + feature/about/src/main/res/values/strings.xml | 1 + 3 files changed, 7 insertions(+) diff --git a/feature/about/src/main/java/io/github/droidkaigi/confsched2020/about/ui/AboutFragment.kt b/feature/about/src/main/java/io/github/droidkaigi/confsched2020/about/ui/AboutFragment.kt index cee19501e..2305b61aa 100644 --- a/feature/about/src/main/java/io/github/droidkaigi/confsched2020/about/ui/AboutFragment.kt +++ b/feature/about/src/main/java/io/github/droidkaigi/confsched2020/about/ui/AboutFragment.kt @@ -89,6 +89,11 @@ class AboutFragment : Fragment(R.layout.fragment_about), Injectable { ) { // TODO go access-page }, + aboutItemFactory.create( + getString(R.string.about_item_wifi) + ) { + // TODO go wifi-page + }, aboutItemFactory.create( getString(R.string.about_item_staff) ) { diff --git a/feature/about/src/main/res/values-ja/strings.xml b/feature/about/src/main/res/values-ja/strings.xml index ae8a1999e..2b7d43a72 100644 --- a/feature/about/src/main/res/values-ja/strings.xml +++ b/feature/about/src/main/res/values-ja/strings.xml @@ -3,6 +3,7 @@ What is DroidKaigi? DroidKaigiはエンジニアが主役のAndroidカンファレンスです。 Android技術情報の共有とコミュニケーションを目的に、2020年2月20日(木)、21日(金)の2日間開催します。 会場アクセス + 会場WiFi スタッフリスト プライバシーポリシー ライセンス diff --git a/feature/about/src/main/res/values/strings.xml b/feature/about/src/main/res/values/strings.xml index 73db10959..4904beae9 100644 --- a/feature/about/src/main/res/values/strings.xml +++ b/feature/about/src/main/res/values/strings.xml @@ -3,6 +3,7 @@ What is DroidKaigi? DroidKaigi is a conference tailored for Android developers. It\'s scheduled to take place on the 20 and 21 of February 2020. Access + WiFi Staffs PrivacyPolicy Licence From 2a25b2e0e8245751748d714256340aa1ef096335 Mon Sep 17 00:00:00 2001 From: yoshida0261 Date: Sun, 9 Feb 2020 02:48:41 +0900 Subject: [PATCH 3/3] feat: add feater:wifi --- .../proguard-rules-navigation.pro | 3 +- .../src/main/res/navigation/navigation.xml | 15 ++++++ .../src/main/res/values-ja/strings.xml | 1 + .../src/main/res/values/strings.xml | 2 + .../confsched2020/about/ui/AboutFragment.kt | 5 +- feature/wifi/build.gradle | 50 +++++++++++++++++++ .../wifi/ExampleInstrumentedTest.kt | 24 +++++++++ feature/wifi/src/main/AndroidManifest.xml | 1 + .../confsched2020/wifi/WifiSettingFragment.kt | 7 +++ .../main/res/layout/fragment_wifi_setting.xml | 6 +++ .../confsched2020/wifi/ExampleUnitTest.kt | 17 +++++++ gradle.properties | 31 +++++------- settings.gradle.kts | 1 + 13 files changed, 141 insertions(+), 22 deletions(-) create mode 100644 feature/wifi/build.gradle create mode 100644 feature/wifi/src/androidTest/java/io/github/droidkaigi/confsched2020/wifi/ExampleInstrumentedTest.kt create mode 100644 feature/wifi/src/main/AndroidManifest.xml create mode 100644 feature/wifi/src/main/java/io/github/droidkaigi/confsched2020/wifi/WifiSettingFragment.kt create mode 100644 feature/wifi/src/main/res/layout/fragment_wifi_setting.xml create mode 100644 feature/wifi/src/test/java/io/github/droidkaigi/confsched2020/wifi/ExampleUnitTest.kt diff --git a/corecomponent/androidcomponent/proguard-rules-navigation.pro b/corecomponent/androidcomponent/proguard-rules-navigation.pro index ea7252579..a1e4cd64a 100644 --- a/corecomponent/androidcomponent/proguard-rules-navigation.pro +++ b/corecomponent/androidcomponent/proguard-rules-navigation.pro @@ -18,4 +18,5 @@ -keepnames class io.github.droidkaigi.confsched2020.session_survey.ui.SessionSurveyFragment -keepnames class io.github.droidkaigi.confsched2020.sponsor.ui.SponsorsFragment -keepnames class io.github.droidkaigi.confsched2020.staff.ui.StaffsFragment --keepnames class io.github.droidkaigi.confsched2020.ui.ChromeCustomTabsNavigator \ No newline at end of file +-keepnames class io.github.droidkaigi.confsched2020.ui.ChromeCustomTabsNavigator +-keepnames class io.github.droidkaigi.confsched2020.wifi.WifiSetingFragment \ No newline at end of file diff --git a/corecomponent/androidcomponent/src/main/res/navigation/navigation.xml b/corecomponent/androidcomponent/src/main/res/navigation/navigation.xml index 9c1fb3a90..b03d464c0 100644 --- a/corecomponent/androidcomponent/src/main/res/navigation/navigation.xml +++ b/corecomponent/androidcomponent/src/main/res/navigation/navigation.xml @@ -254,6 +254,13 @@ app:argType="string" app:nullable="false" /> + + + + + フィルター%1$sを解除 スタッフリスト ライセンス + WiFi スピーカー diff --git a/corecomponent/androidcomponent/src/main/res/values/strings.xml b/corecomponent/androidcomponent/src/main/res/values/strings.xml index 9b2f163ac..2b1386797 100644 --- a/corecomponent/androidcomponent/src/main/res/values/strings.xml +++ b/corecomponent/androidcomponent/src/main/res/values/strings.xml @@ -18,6 +18,8 @@ Entire survey more Session survey + WiFi + Search diff --git a/feature/about/src/main/java/io/github/droidkaigi/confsched2020/about/ui/AboutFragment.kt b/feature/about/src/main/java/io/github/droidkaigi/confsched2020/about/ui/AboutFragment.kt index 07061a6b6..d2659bb1a 100644 --- a/feature/about/src/main/java/io/github/droidkaigi/confsched2020/about/ui/AboutFragment.kt +++ b/feature/about/src/main/java/io/github/droidkaigi/confsched2020/about/ui/AboutFragment.kt @@ -6,8 +6,8 @@ import androidx.core.view.updatePadding import androidx.fragment.app.Fragment import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LiveData -import com.google.android.gms.oss.licenses.OssLicensesMenuActivity import androidx.navigation.fragment.findNavController +import com.google.android.gms.oss.licenses.OssLicensesMenuActivity import com.xwray.groupie.GroupAdapter import com.xwray.groupie.databinding.GroupieViewHolder import dagger.Module @@ -17,6 +17,7 @@ import io.github.droidkaigi.confsched2020.about.R import io.github.droidkaigi.confsched2020.about.databinding.FragmentAboutBinding import io.github.droidkaigi.confsched2020.about.ui.AboutFragmentDirections.Companion.actionAboutToChrome import io.github.droidkaigi.confsched2020.about.ui.AboutFragmentDirections.Companion.actionAboutToStaffs +import io.github.droidkaigi.confsched2020.about.ui.AboutFragmentDirections.Companion.actionAboutToWifi import io.github.droidkaigi.confsched2020.about.ui.item.AboutHeaderItem import io.github.droidkaigi.confsched2020.about.ui.item.AboutItem import io.github.droidkaigi.confsched2020.about.ui.item.AboutLaunchItem @@ -96,7 +97,7 @@ class AboutFragment : Fragment(R.layout.fragment_about), Injectable { aboutItemFactory.create( getString(R.string.about_item_wifi) ) { - // TODO go wifi-page + findNavController().navigate(actionAboutToWifi()) }, aboutItemFactory.create( getString(R.string.about_item_staff) diff --git a/feature/wifi/build.gradle b/feature/wifi/build.gradle new file mode 100644 index 000000000..60ed1b51e --- /dev/null +++ b/feature/wifi/build.gradle @@ -0,0 +1,50 @@ +import dependencies.Dep + +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-kapt' +apply plugin: 'androidx.navigation.safeargs.kotlin' + +apply from: rootProject.file('gradle/android.gradle') + +dependencies { +// implementation project(':android-base') + + implementation project(':feature:system') + + implementation project(':corecomponent:androidcomponent') + implementation project(":data:repository") + implementation project(":data:db") + implementation project(':ext:log') + + implementation Dep.Kotlin.stdlibJvm + implementation Dep.Kotlin.coroutines + implementation Dep.Kotlin.androidCoroutinesDispatcher + + implementation Dep.AndroidX.appCompat + implementation Dep.AndroidX.constraint + implementation Dep.AndroidX.recyclerView + implementation Dep.AndroidX.emoji + implementation Dep.AndroidX.design + + implementation Dep.Dagger.core + implementation Dep.Dagger.androidSupport + kapt Dep.Dagger.compiler + kapt Dep.Dagger.androidProcessor + compileOnly Dep.Dagger.assistedInjectAnnotations + kapt Dep.Dagger.assistedInjectProcessor + + implementation Dep.Groupie.groupie + implementation Dep.Groupie.databinding + + implementation Dep.Coil.coil + + implementation Dep.Store.store + + testImplementation project(':corecomponent:androidtestcomponent') + testImplementation Dep.Test.junit + testImplementation Dep.Test.kotlinTestAssertions + testImplementation Dep.MockK.jvm + androidTestImplementation Dep.Test.testRunner + androidTestImplementation Dep.Test.espressoCore +} diff --git a/feature/wifi/src/androidTest/java/io/github/droidkaigi/confsched2020/wifi/ExampleInstrumentedTest.kt b/feature/wifi/src/androidTest/java/io/github/droidkaigi/confsched2020/wifi/ExampleInstrumentedTest.kt new file mode 100644 index 000000000..8d5b3b3d4 --- /dev/null +++ b/feature/wifi/src/androidTest/java/io/github/droidkaigi/confsched2020/wifi/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package io.github.droidkaigi.confsched2020.wifi + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.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.getInstrumentation().targetContext + assertEquals("io.github.droidkaigi.confsched2020.wifi.test", appContext.packageName) + } +} diff --git a/feature/wifi/src/main/AndroidManifest.xml b/feature/wifi/src/main/AndroidManifest.xml new file mode 100644 index 000000000..9712cabc5 --- /dev/null +++ b/feature/wifi/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/feature/wifi/src/main/java/io/github/droidkaigi/confsched2020/wifi/WifiSettingFragment.kt b/feature/wifi/src/main/java/io/github/droidkaigi/confsched2020/wifi/WifiSettingFragment.kt new file mode 100644 index 000000000..740c37540 --- /dev/null +++ b/feature/wifi/src/main/java/io/github/droidkaigi/confsched2020/wifi/WifiSettingFragment.kt @@ -0,0 +1,7 @@ +package io.github.droidkaigi.confsched2020.wifi + +import androidx.fragment.app.Fragment + +class WifiSettingFragment : Fragment(R.layout.fragment_wifi_setting){ + +} diff --git a/feature/wifi/src/main/res/layout/fragment_wifi_setting.xml b/feature/wifi/src/main/res/layout/fragment_wifi_setting.xml new file mode 100644 index 000000000..3440167ee --- /dev/null +++ b/feature/wifi/src/main/res/layout/fragment_wifi_setting.xml @@ -0,0 +1,6 @@ + + + + diff --git a/feature/wifi/src/test/java/io/github/droidkaigi/confsched2020/wifi/ExampleUnitTest.kt b/feature/wifi/src/test/java/io/github/droidkaigi/confsched2020/wifi/ExampleUnitTest.kt new file mode 100644 index 000000000..3a65a7835 --- /dev/null +++ b/feature/wifi/src/test/java/io/github/droidkaigi/confsched2020/wifi/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package io.github.droidkaigi.confsched2020.wifi + +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/gradle.properties b/gradle.properties index 67f04d89b..7ad8a0bb6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,29 +1,22 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit +## For more details on how to configure your build environment visit # http://www.gradle.org/docs/current/userguide/build_environment.html +# # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +# Default value: -Xmx1024m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +# # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true -# Automatically convert third-party libraries to use AndroidX -android.enableJetifier=true -# Kotlin code style for this project: "official" or "obsolete": +#Sun Feb 09 02:12:05 JST 2020 +systemProp.org.gradle.internal.http.socketTimeout=180000 +systemProp.org.gradle.internal.http.connectionTimeout=180000 kotlin.code.style=official - org.gradle.parallel=true - -kotlin.incremental.multiplatform = true kotlin.parallel.tasks.in.project=true - -systemProp.org.gradle.internal.http.connectionTimeout=180000 -systemProp.org.gradle.internal.http.socketTimeout=180000 \ No newline at end of file +kotlin.incremental.multiplatform=true +org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx1536M" -XX\:MaxPermSize\=2048m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8 +android.useAndroidX=true +android.enableJetifier=true diff --git a/settings.gradle.kts b/settings.gradle.kts index fab84894f..dd7e0450b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,6 +11,7 @@ include(":android-base", ":feature:about", ":feature:floormap", ":feature:session_survey", + ":feature:wifi", ":corecomponent:androidcomponent", ":corecomponent:androidtestcomponent", ":model",