Skip to content

Commit

Permalink
Update about
Browse files Browse the repository at this point in the history
  • Loading branch information
kpgalligan committed Aug 3, 2018
1 parent 6011bd3 commit 2dfec9f
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 10 deletions.
Binary file not shown.
16 changes: 8 additions & 8 deletions sessionize/app/src/main/assets/about.json
@@ -1,17 +1,17 @@
[
{
"icon": "",
"icon": "about_kotlin",
"title": "Droidcon App",
"detail": "Some Droidcon detail"
"detail": "The Droidcon app is a Kotlin Multiplatform app by the touchlab team and some folks from the mobile development community.\n\nSee the repo and read more at:\nhttps://github.com/touchlab/DroidconKotlin.\n\nThe non-UI logic of the application is built using Kotlin Multiplatform and Kotlin/Native.\n\nLibraries include KNarch.db, SQLDelight, and multiplatform-settings. See the project github for more detail on libraries used and the architecture."
},
{
"icon": "",
"title": "Droidcon App",
"detail": "Some Droidcon detail"
"icon": "about_touchlab",
"title": "About Touchlab",
"detail": "Touchlab Accelerates Mobile Innovation for Enterprise and Startups.\n\nGet in touch.\n\nhttp://touchlab.co"
},
{
"icon": "",
"title": "Droidcon App",
"detail": "Hey hey, something something. Here's a link: https://touchlab.co. That was a link."
"icon": "about_droidcon",
"title": "Droidcon",
"detail": "Droidcon conferences around the world support the Android platform and create a global network for developers and companies.\n\nWe offer best-in-class presentations from leaders in all parts of the Android ecosystem, including core development, embedded solutions, augmented reality, business solutions, and games."
}
]
Expand Up @@ -58,7 +58,11 @@ class AboutFragment : Fragment() {
holder.body.text = aboutInfo.detail
if(!aboutInfo.icon.isNullOrBlank()) {
holder.logo.setImageResource(finDrawableId(requireContext(), aboutInfo.icon))
holder.logo.visibility = View.VISIBLE
}else{
holder.logo.visibility = View.GONE
}

}

}
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions sessionize/app/src/main/res/layout/item_about_info.xml
Expand Up @@ -46,8 +46,8 @@
<ImageView
android:id="@+id/logo"
style="@style/about_item"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="240dp"
android:layout_height="42dp"
android:layout_below="@+id/body"
android:layout_centerHorizontal="true"
android:layout_toEndOf="@id/icon"
Expand Down

0 comments on commit 2dfec9f

Please sign in to comment.