Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] fix #584 Add Wifi Setting Page #666

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion corecomponent/androidcomponent/proguard-rules-navigation.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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
-keepnames class io.github.droidkaigi.confsched2020.ui.ChromeCustomTabsNavigator
-keepnames class io.github.droidkaigi.confsched2020.wifi.WifiSetingFragment
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,13 @@
app:argType="string"
app:nullable="false" />
</action>
<action
android:id="@+id/action_about_to_wifi"
app:destination="@id/wifi_setting"
app:enterAnim="@anim/fade_in"
app:exitAnim="@anim/fade_out"
app:popEnterAnim="@anim/fade_in"
app:popExitAnim="@anim/fade_out" />
</fragment>
<fragment
android:id="@+id/floormap"
Expand Down Expand Up @@ -282,6 +289,14 @@
app:argType="io.github.droidkaigi.confsched2020.model.SessionId"
/>
</fragment>
<fragment
android:id="@+id/wifi_setting"
android:name="io.github.droidkaigi.confsched2020.wifi.WifiSetingFragment"
android:label="@string/wifi_label"
>
<!-- TBD -->
</fragment>

<fragment
android:id="@+id/setting"
android:name="io.github.droidkaigi.confsched2020.preference.ui.PreferencesFragment"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<string name="description_filter_not_applied">フィルター%1$sを解除</string>
<string name="staffs_label">スタッフリスト</string>
<string name="licenses_label">ライセンス</string>
<string name="wifi_label">WiFi</string>
<!-- Speaker -->
<string name="speaker_label">スピーカー</string>
<!-- Notification -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
<string name="survey_label">Entire survey</string>
<string name="ellipsis_label">more</string>
<string name="session_survey_label">Session survey</string>
<string name="wifi_label">WiFi</string>

<!-- Search -->
<string name="search_label" translatable="false">Search</string>
<!-- Contributor -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -93,6 +94,11 @@ class AboutFragment : Fragment(R.layout.fragment_about), Injectable {
) {
systemViewModel.navigateToAccessMap(requireActivity())
},
aboutItemFactory.create(
getString(R.string.about_item_wifi)
) {
findNavController().navigate(actionAboutToWifi())
},
aboutItemFactory.create(
getString(R.string.about_item_staff)
) {
Expand Down
1 change: 1 addition & 0 deletions feature/about/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<string name="about_what_is_droidkaigi">What is DroidKaigi?</string>
<string name="about_description">DroidKaigiはエンジニアが主役のAndroidカンファレンスです。 Android技術情報の共有とコミュニケーションを目的に、2020年2月20日(木)、21日(金)の2日間開催します。</string>
<string name="about_item_access">会場アクセス</string>
<string name="about_item_wifi">会場WiFi</string>
<string name="about_item_staff">スタッフリスト</string>
<string name="about_item_privacy_policy">プライバシーポリシー</string>
<string name="about_item_licence">ライセンス</string>
Expand Down
1 change: 1 addition & 0 deletions feature/about/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<string name="about_what_is_droidkaigi">What is DroidKaigi?</string>
<string name="about_description">DroidKaigi is a conference tailored for Android developers. It\'s scheduled to take place on the 20 and 21 of February 2020.</string>
<string name="about_item_access">Access</string>
<string name="about_item_wifi">WiFi</string>
<string name="about_item_staff">Staffs</string>
<string name="about_item_privacy_policy">PrivacyPolicy</string>
<string name="about_item_licence">Licence</string>
Expand Down
50 changes: 50 additions & 0 deletions feature/wifi/build.gradle
Original file line number Diff line number Diff line change
@@ -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
}
Original file line number Diff line number Diff line change
@@ -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)
}
}
1 change: 1 addition & 0 deletions feature/wifi/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<manifest package="io.github.droidkaigi.confsched2020.wifi" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package io.github.droidkaigi.confsched2020.wifi

import androidx.fragment.app.Fragment

class WifiSettingFragment : Fragment(R.layout.fragment_wifi_setting){

}
6 changes: 6 additions & 0 deletions feature/wifi/src/main/res/layout/fragment_wifi_setting.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:layout_height="match_parent">

</androidx.constraintlayout.widget.ConstraintLayout>
Original file line number Diff line number Diff line change
@@ -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)
}
}
31 changes: 12 additions & 19 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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
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
1 change: 1 addition & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ include(":android-base",
":feature:about",
":feature:floormap",
":feature:session_survey",
":feature:wifi",
":corecomponent:androidcomponent",
":corecomponent:androidtestcomponent",
":model",
Expand Down