diff --git a/.gitignore b/.gitignore index d640f0c26..08b1a8fe2 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,8 @@ captures/ /.idea/workspace.xml /.idea/navEditor.xml /.idea/assetWizardSettings.xml +/.idea/encodings.xml +/.idea/codeStyles/Project.xml .DS_Store /build /captures diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index e59356c85..7620b4d63 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -7,5 +7,30 @@ + + + + + + + + + + - \ No newline at end of file + diff --git a/sessionize/app/src/main/java/co/touchlab/sessionize/event/EventFragment.kt b/sessionize/app/src/main/java/co/touchlab/sessionize/event/EventFragment.kt index 268ff803a..8ded28644 100644 --- a/sessionize/app/src/main/java/co/touchlab/sessionize/event/EventFragment.kt +++ b/sessionize/app/src/main/java/co/touchlab/sessionize/event/EventFragment.kt @@ -5,6 +5,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView +import androidx.appcompat.app.AppCompatActivity import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment diff --git a/sessionize/app/src/main/java/co/touchlab/sessionize/sponsors/SponsorSessionFragment.kt b/sessionize/app/src/main/java/co/touchlab/sessionize/sponsors/SponsorSessionFragment.kt index ac44956e9..95956198d 100644 --- a/sessionize/app/src/main/java/co/touchlab/sessionize/sponsors/SponsorSessionFragment.kt +++ b/sessionize/app/src/main/java/co/touchlab/sessionize/sponsors/SponsorSessionFragment.kt @@ -86,15 +86,8 @@ class SponsorSessionFragment : Fragment() { val adapter = SponsorSessionAdapter(activity!!) sponsorSessionTitle.text = sponsor.sponsor.name -// eventRoomTime.text = formattedRoomTime adapter.addHeader(sponsor.sponsor.name) -// when { -// event.isNow() -> adapter.addInfo("" + resources.getString(R.string.event_now) + "") -// event.isPast() -> adapter.addInfo("" + resources.getString(R.string.event_past) + "") -// event.conflict -> adapter.addInfo("" + resources.getString(R.string.event_conflict) + "") -// } - sponsor.sponsor.description?.let { adapter.addBody(it) } diff --git a/sessionize/app/src/main/java/co/touchlab/sessionize/sponsors/SponsorsFragment.kt b/sessionize/app/src/main/java/co/touchlab/sessionize/sponsors/SponsorsFragment.kt index 9693badc1..e2a7330b2 100644 --- a/sessionize/app/src/main/java/co/touchlab/sessionize/sponsors/SponsorsFragment.kt +++ b/sessionize/app/src/main/java/co/touchlab/sessionize/sponsors/SponsorsFragment.kt @@ -19,7 +19,6 @@ import androidx.lifecycle.ViewModelProviders import co.touchlab.sessionize.FragmentAnimation import co.touchlab.sessionize.NavigationHost import co.touchlab.sessionize.db.SponsorGroupDbItem -import kotlinx.android.synthetic.main.item_sponsor_group.* class SponsorsFragment : Fragment() { diff --git a/sessionize/lib/src/commonMain/kotlin/co/touchlab/sessionize/api/SessionizeApiImpl.kt b/sessionize/lib/src/commonMain/kotlin/co/touchlab/sessionize/api/SessionizeApiImpl.kt index 38f53c6aa..8bedb3490 100644 --- a/sessionize/lib/src/commonMain/kotlin/co/touchlab/sessionize/api/SessionizeApiImpl.kt +++ b/sessionize/lib/src/commonMain/kotlin/co/touchlab/sessionize/api/SessionizeApiImpl.kt @@ -35,7 +35,7 @@ object SessionizeApiImpl : SessionizeApi { } override suspend fun getSponsorJson(): String = client.get { - amazon("/droidconsponsers/sponsors-$INSTANCE_ID.json") + amazon("/droidconsponsers/sponsors-$INSTANCE_ID.json") // github = 404 } override suspend fun getSponsorSessionJson(): String = client.get { @@ -69,6 +69,13 @@ object SessionizeApiImpl : SessionizeApi { encodedPath = path } } + + private fun HttpRequestBuilder.github(path: String) { + url { + takeFrom("https://raw.githubusercontent.com/touchlab/DroidconKotlin") + encodedPath = path + } + } } internal fun userUuid(): String {