Skip to content
Snippets Groups Projects
Verified Commit d5809845 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Improved about screen

parent b2f22f0f
No related branches found
No related tags found
No related merge requests found
{
"data": [
{
"name": "Janne Koschinski",
"nickname": "justJanne",
"description": "Rewrite, UI, Annotation Processors, Backend"
},
{
"name": "Frederik M. J. Vestre",
"nickname": "freqmod",
......@@ -19,11 +24,6 @@
"name": "Ken Børge Viktil",
"nickname": "Kenji",
"description": "Legacy UI"
},
{
"name": "Janne Koschinski",
"nickname": "justJanne",
"description": "Rewrite, UI, Annotation Processors, Backend"
}
]
}
......@@ -70,6 +70,7 @@ import de.kuschku.quasseldroid.settings.MessageSettings
import de.kuschku.quasseldroid.settings.Settings
import de.kuschku.quasseldroid.ui.chat.input.AutoCompleteAdapter
import de.kuschku.quasseldroid.ui.chat.input.ChatlineFragment
import de.kuschku.quasseldroid.ui.clientsettings.about.AboutActivity
import de.kuschku.quasseldroid.ui.clientsettings.client.ClientSettingsActivity
import de.kuschku.quasseldroid.ui.coresettings.CoreSettingsActivity
import de.kuschku.quasseldroid.ui.setup.accounts.selection.AccountSelectionActivity
......@@ -914,6 +915,10 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
ClientSettingsActivity.launch(this)
true
}
R.id.action_about -> {
AboutActivity.launch(this)
true
}
R.id.action_disconnect -> {
disconnect()
true
......
......@@ -61,8 +61,11 @@ class AboutFragment : DaggerFragment() {
@BindView(R.id.action_privacy_policy)
lateinit var privacyPolicy: Button
@BindView(R.id.contributors)
lateinit var contributors: RecyclerView
@BindView(R.id.authors)
lateinit var authors: RecyclerView
@BindView(R.id.acknowledgements)
lateinit var acknowledgements: RecyclerView
@BindView(R.id.translators)
lateinit var translators: RecyclerView
......@@ -296,9 +299,21 @@ class AboutFragment : DaggerFragment() {
libraries.addItemDecoration(DividerItemDecoration(context, LinearLayoutManager.VERTICAL))
ViewCompat.setNestedScrollingEnabled(libraries, false)
contributors.layoutManager = LinearLayoutManager(context)
contributors.itemAnimator = null
contributors.adapter = ContributorAdapter(listOf(
authors.layoutManager = LinearLayoutManager(context)
authors.itemAnimator = null
authors.adapter = ContributorAdapter(listOf(
Contributor(
name = "Janne Koschinski",
nickName = "justJanne",
description = getString(R.string.contributor_description_justjanne)
)
))
authors.addItemDecoration(DividerItemDecoration(context, LinearLayoutManager.VERTICAL))
ViewCompat.setNestedScrollingEnabled(authors, false)
acknowledgements.layoutManager = LinearLayoutManager(context)
acknowledgements.itemAnimator = null
acknowledgements.adapter = ContributorAdapter(listOf(
Contributor(
name = "Frederik M. J. Vestre",
nickName = "freqmod",
......@@ -318,15 +333,10 @@ class AboutFragment : DaggerFragment() {
name = "Ken Børge Viktil",
nickName = "Kenji",
description = getString(R.string.contributor_description_kenji)
),
Contributor(
name = "Janne Koschinski",
nickName = "justJanne",
description = getString(R.string.contributor_description_justjanne)
)
))
contributors.addItemDecoration(DividerItemDecoration(context, LinearLayoutManager.VERTICAL))
ViewCompat.setNestedScrollingEnabled(contributors, false)
acknowledgements.addItemDecoration(DividerItemDecoration(context, LinearLayoutManager.VERTICAL))
ViewCompat.setNestedScrollingEnabled(acknowledgements, false)
translators.layoutManager = LinearLayoutManager(context)
translators.itemAnimator = null
......
......@@ -33,16 +33,34 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="?listPreferredItemHeight"
android:descendantFocusability="blocksDescendants"
android:orientation="vertical">
<TextView
style="@style/Widget.Subhead"
android:text="@string/label_contributors" />
android:text="@string/label_authors" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/contributors"
android:id="@+id/authors"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:itemCount="1"
tools:listitem="@layout/widget_contributor" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:descendantFocusability="blocksDescendants"
android:orientation="vertical">
<TextView
style="@style/Widget.Subhead"
android:text="@string/label_acknowledgements" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/acknowledgements"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:itemCount="5"
......@@ -53,7 +71,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="?listPreferredItemHeight"
android:descendantFocusability="blocksDescendants"
android:orientation="vertical">
......@@ -73,7 +90,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="?listPreferredItemHeight"
android:orientation="vertical">
<TextView
......
......@@ -33,6 +33,9 @@
<item
android:id="@+id/action_client_settings"
android:title="@string/label_settings_client" />
<item
android:id="@+id/action_about"
android:title="@string/label_about" />
<item
android:id="@+id/action_disconnect"
android:title="@string/label_disconnect" />
......
......@@ -27,7 +27,9 @@
<string name="label_about">About</string>
<string name="label_accept">Accept</string>
<string name="label_acknowledgements">Acknowledgements</string>
<string name="label_ascending">Ascending</string>
<string name="label_authors">Authors</string>
<string name="label_autocomplete">Autocomplete</string>
<string name="label_avatar">Avatar</string>
<string name="label_back">Back</string>
......@@ -41,7 +43,6 @@
<string name="label_colors_mirc">mIRC</string>
<string name="label_configure">Configure</string>
<string name="label_connect">Connect</string>
<string name="label_contributors">Contributors</string>
<string name="label_copy">Copy</string>
<string name="label_crashes">Crashes</string>
<string name="label_crashes_empty">No crash reports found</string>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment