From d5809845057dd663b78f5b23202477a20e3944dc Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 1 Feb 2019 17:05:44 +0100
Subject: [PATCH] Improved about screen
---
app/sampledata/contributors.json | 12 +++----
.../quasseldroid/ui/chat/ChatActivity.kt | 5 +++
.../ui/clientsettings/about/AboutFragment.kt | 34 ++++++++++++-------
app/src/main/res/layout/preferences_about.xml | 26 +++++++++++---
app/src/main/res/menu/activity_main.xml | 3 ++
app/src/main/res/values/strings.xml | 3 +-
6 files changed, 59 insertions(+), 24 deletions(-)
diff --git a/app/sampledata/contributors.json b/app/sampledata/contributors.json
index 8683df065..240009a2a 100644
--- a/app/sampledata/contributors.json
+++ b/app/sampledata/contributors.json
@@ -1,5 +1,10 @@
{
"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"
}
]
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
index 88ffb8c8a..cf52ec8cc 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
@@ -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
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt
index c28d5eb61..ed626eb9e 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt
@@ -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
diff --git a/app/src/main/res/layout/preferences_about.xml b/app/src/main/res/layout/preferences_about.xml
index cbeaf81fd..3f7c49ae1 100644
--- a/app/src/main/res/layout/preferences_about.xml
+++ b/app/src/main/res/layout/preferences_about.xml
@@ -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
diff --git a/app/src/main/res/menu/activity_main.xml b/app/src/main/res/menu/activity_main.xml
index c5b8aa5d5..af9223334 100644
--- a/app/src/main/res/menu/activity_main.xml
+++ b/app/src/main/res/menu/activity_main.xml
@@ -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" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a25af0b5b..714217941 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -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>
--
GitLab