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 1840113ddc58596c5b2c35d6b795cb458b68ce54..05d6bee4e56aa907793769747fb5c6fd86bd3a5e 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 @@ -358,26 +358,26 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc val toggleHighlight = DrawerToggleActivityDrawable(themedContext, R.attr.colorTintHighlight) val toggleNotification = DrawerToggleActivityDrawable(themedContext, R.attr.colorTintNotification) - maxBufferActivity.toLiveData().observe(this@ChatActivity, - Observer { (activity, hasNotifications) -> - setHomeAsUpIndicator( - when { - notificationSettings.showAllActivitiesInToolbar && - activity == Buffer_Activity.Highlight -> - toggleHighlight - notificationSettings.showAllActivitiesInToolbar && - activity == Buffer_Activity.NewMessage -> - toggleNewMessage - notificationSettings.showAllActivitiesInToolbar && - activity == Buffer_Activity.OtherActivity -> - toggleOtherActivity - hasNotifications -> - toggleNotification - else -> - toggleDefault - } - ) - }) + maxBufferActivity.toLiveData() + .observe(this@ChatActivity, Observer { (activity, hasNotifications) -> + setHomeAsUpIndicator( + when { + notificationSettings.showAllActivitiesInToolbar && + activity == Buffer_Activity.Highlight -> + toggleHighlight + notificationSettings.showAllActivitiesInToolbar && + activity == Buffer_Activity.NewMessage -> + toggleNewMessage + notificationSettings.showAllActivitiesInToolbar && + activity == Buffer_Activity.OtherActivity -> + toggleOtherActivity + hasNotifications -> + toggleNotification + else -> + toggleDefault + } + ) + }) } if (autoCompleteSettings.prefix || autoCompleteSettings.auto) { diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/add/query/QueryCreateFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/add/query/QueryCreateFragmentProvider.kt index 3d1536183f52f10286c4069981bdc6346895fbe4..b96b2165c98d5810ad13ad103cfe8561fe6a22f7 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/add/query/QueryCreateFragmentProvider.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/add/query/QueryCreateFragmentProvider.kt @@ -23,7 +23,6 @@ import androidx.fragment.app.FragmentActivity import dagger.Binds import dagger.Module import dagger.android.ContributesAndroidInjector -import de.kuschku.quasseldroid.ui.chat.add.query.QueryCreateActivity @Module abstract class QueryCreateFragmentProvider { diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt index 7705bd346a3176d973d3764f036be7f1d043b8ed..de818a6de6ee423fdc40d2f42d636c01bfbb5c30 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt @@ -591,11 +591,11 @@ class BufferViewConfigFragment : ServiceBoundFragment() { fab.setOnActionSelectedListener { when (it.id) { - R.id.fab_query -> { + R.id.fab_query -> { context?.let(QueryCreateActivity.Companion::launch) true } - R.id.fab_join -> { + R.id.fab_join -> { context?.let(ChannelJoinActivity.Companion::launch) true } @@ -603,7 +603,7 @@ class BufferViewConfigFragment : ServiceBoundFragment() { context?.let(ChannelCreateActivity.Companion::launch) true } - else -> false + else -> false } } diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsFragment.kt index 30dc52eae73b50b1aa7950f00b8172580f5789d4..04f8fc2ac02aa1068cd8eff220bf422e89d54c70 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsFragment.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsFragment.kt @@ -41,7 +41,7 @@ import de.kuschku.quasseldroid.util.ui.settings.DaggerPreferenceFragmentCompat import javax.inject.Inject class ClientSettingsFragment : DaggerPreferenceFragmentCompat(), - SharedPreferences.OnSharedPreferenceChangeListener { + SharedPreferences.OnSharedPreferenceChangeListener { @Inject lateinit var appearanceSettings: AppearanceSettings @@ -97,7 +97,7 @@ class ClientSettingsFragment : DaggerPreferenceFragmentCompat(), updateSummary(findPreference(key)) val appearanceSettings = Settings.appearance(context!!) if (this.appearanceSettings.theme != appearanceSettings.theme || - this.appearanceSettings.language != appearanceSettings.language) { + this.appearanceSettings.language != appearanceSettings.language) { activity?.recreate() } } @@ -126,14 +126,14 @@ class ClientSettingsFragment : DaggerPreferenceFragmentCompat(), WhitelistActivity.launch(requireContext()) true } - R.id.action_crashes -> { + R.id.action_crashes -> { CrashActivity.launch(requireContext()) true } - R.id.action_about -> { + R.id.action_about -> { AboutActivity.launch(requireContext()) true } - else -> super.onOptionsItemSelected(item) + else -> super.onOptionsItemSelected(item) } } diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/CharSequenceHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/CharSequenceHelper.kt index 6f41bc665c2815f7e7200d3d245209f3d286d8b4..59662ca845f7e84244018153244e575aa280d4ff 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/CharSequenceHelper.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/CharSequenceHelper.kt @@ -17,6 +17,7 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ @file:Suppress("NOTHING_TO_INLINE") + package de.kuschku.quasseldroid.util.helper private class DelimitedRangesSequence( diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatDeserializer.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatDeserializer.kt index 79de3d8c8e590e7c8e799b482494f4ddf7497dc5..47be10e84471e9de329ab412bc6064d55916b2ab 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatDeserializer.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatDeserializer.kt @@ -375,7 +375,7 @@ class IrcFormatDeserializer(private val mircColors: IntArray) { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' -> { // Do nothing } - else -> break@loop + else -> break@loop } i++ } @@ -396,7 +396,7 @@ class IrcFormatDeserializer(private val mircColors: IntArray) { 'c', 'd', 'e', 'f' -> { // Do nothing } - else -> break@loop + else -> break@loop } i++ } diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml index afa256e084aa793148917d45b1d864929d31c483..757f99be9380d2227e6af761568fd60679d3aac2 100644 --- a/app/src/main/res/layout/activity_setup.xml +++ b/app/src/main/res/layout/activity_setup.xml @@ -43,8 +43,8 @@ android:layout_gravity="right|bottom" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" - app:fabSize="normal" app:backgroundTint="?colorAccent" + app:fabSize="normal" app:srcCompat="@drawable/ic_forward" app:tint="#ffffffff" tools:ignore="RtlHardcoded" diff --git a/app/src/main/res/layout/preferences_about_header.xml b/app/src/main/res/layout/preferences_about_header.xml index 1c67ca105b21904de0862fd03fbcdffb7da437ca..aad075855eaf4dc8e1b31fd30b181912c97dcd18 100644 --- a/app/src/main/res/layout/preferences_about_header.xml +++ b/app/src/main/res/layout/preferences_about_header.xml @@ -79,8 +79,8 @@ style="@style/Widget.Button.Colored" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:backgroundTint="?colorPrimary" - android:text="@string/label_website" /> + android:text="@string/label_website" + app:backgroundTint="?colorPrimary" /> <Space android:layout_width="8dp" diff --git a/app/src/main/res/layout/settings_network.xml b/app/src/main/res/layout/settings_network.xml index 547d838c102c078fadfb051ef700237231cb2d81..1e78a687431b8719d0a7b41ef17c1689f6d4eab7 100644 --- a/app/src/main/res/layout/settings_network.xml +++ b/app/src/main/res/layout/settings_network.xml @@ -103,8 +103,8 @@ android:visibility="visible"> <de.kuschku.ui.spinner.MaterialSpinnerLayout - android:layout_width="match_parent" style="@style/Widget.CustomSpinnerLayout" + android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/settings_network_identity"> diff --git a/app/src/main/res/layout/settings_passwordchange.xml b/app/src/main/res/layout/settings_passwordchange.xml index 7cc1fb441221e8cae6d6a0a6d487e5f909b04157..22e29ae8867e9551e3c9edd443a3bf1ab76e0489 100644 --- a/app/src/main/res/layout/settings_passwordchange.xml +++ b/app/src/main/res/layout/settings_passwordchange.xml @@ -51,10 +51,10 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/password_old_wrapper" + style="@style/Widget.CustomTextInput" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - style="@style/Widget.CustomTextInput" android:hint="@string/label_password_old" app:passwordToggleEnabled="true" tools:ignore="LabelFor"> @@ -68,10 +68,10 @@ </com.google.android.material.textfield.TextInputLayout> <com.google.android.material.textfield.TextInputLayout + style="@style/Widget.CustomTextInput" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/label_password_new" - style="@style/Widget.CustomTextInput" app:passwordToggleEnabled="true" tools:ignore="LabelFor"> @@ -85,10 +85,10 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/password_repeat_wrapper" + style="@style/Widget.CustomTextInput" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - style="@style/Widget.CustomTextInput" android:hint="@string/label_password_repeat" app:passwordToggleEnabled="true" tools:ignore="LabelFor"> diff --git a/app/src/main/res/layout/setup_account_connection.xml b/app/src/main/res/layout/setup_account_connection.xml index 776b926420ff927a32db5c602433ea1037aa8e9a..e3f1461dae8ca0010eb7de36f9cb1342f4a6a20a 100644 --- a/app/src/main/res/layout/setup_account_connection.xml +++ b/app/src/main/res/layout/setup_account_connection.xml @@ -45,10 +45,10 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/portWrapper" + style="@style/Widget.CustomTextInput" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/label_connection_port" - style="@style/Widget.CustomTextInput" app:errorEnabled="true" tools:ignore="LabelFor"> diff --git a/app/src/main/res/layout/setup_account_edit.xml b/app/src/main/res/layout/setup_account_edit.xml index 26535ff1a4476a5db417795d0bc4a6bf7fe6c495..a71ac7d11e99a7054e6f5514c761021521285394 100644 --- a/app/src/main/res/layout/setup_account_edit.xml +++ b/app/src/main/res/layout/setup_account_edit.xml @@ -169,8 +169,8 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/userWrapper" - android:layout_width="match_parent" style="@style/Widget.CustomTextInput" + android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/label_account_user" tools:ignore="LabelFor"> @@ -185,8 +185,8 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/passWrapper" - android:layout_width="match_parent" style="@style/Widget.CustomTextInput" + android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/label_account_pass" app:passwordToggleEnabled="true" diff --git a/app/src/main/res/layout/setup_account_name.xml b/app/src/main/res/layout/setup_account_name.xml index c7b4235a2fc72afbdc57aef75838e323c6614c01..47f91e5bd3be4624bf4043c48dc5117fecd35ced 100644 --- a/app/src/main/res/layout/setup_account_name.xml +++ b/app/src/main/res/layout/setup_account_name.xml @@ -27,9 +27,9 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/nameWrapper" + style="@style/Widget.CustomTextInput" android:layout_width="match_parent" android:layout_height="wrap_content" - style="@style/Widget.CustomTextInput" android:hint="@string/label_account_name" app:errorEnabled="true" tools:ignore="LabelFor"> diff --git a/app/src/main/res/layout/setup_account_user.xml b/app/src/main/res/layout/setup_account_user.xml index 8b9306e931811486c404990839312dbf35739d08..72d6dc075ea87594960b541ba4f2d8287920ed76 100644 --- a/app/src/main/res/layout/setup_account_user.xml +++ b/app/src/main/res/layout/setup_account_user.xml @@ -27,10 +27,10 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/userWrapper" + style="@style/Widget.CustomTextInput" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/label_account_user" - style="@style/Widget.CustomTextInput" tools:ignore="LabelFor"> <com.google.android.material.textfield.TextInputEditText @@ -43,10 +43,10 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/passWrapper" + style="@style/Widget.CustomTextInput" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/label_account_pass" - style="@style/Widget.CustomTextInput" app:passwordToggleEnabled="true" tools:ignore="LabelFor"> diff --git a/app/src/main/res/layout/setup_network_network.xml b/app/src/main/res/layout/setup_network_network.xml index 820dd537dd7fb0b4c50e78bfcad566f54365f2cc..d19e89fd350900bbf5487311494c87fefd89689f 100644 --- a/app/src/main/res/layout/setup_network_network.xml +++ b/app/src/main/res/layout/setup_network_network.xml @@ -77,10 +77,10 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/hostWrapper" + style="@style/Widget.CustomTextInput" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/settings_networkserver_host" - style="@style/Widget.CustomTextInput" tools:ignore="LabelFor"> <com.google.android.material.textfield.TextInputEditText @@ -93,10 +93,10 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/portWrapper" + style="@style/Widget.CustomTextInput" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/settings_networkserver_port" - style="@style/Widget.CustomTextInput" app:passwordToggleEnabled="true" tools:ignore="LabelFor"> diff --git a/app/src/main/res/layout/setup_user_channels.xml b/app/src/main/res/layout/setup_user_channels.xml index bedf3c7d3e38901a20d5eb77445c50c4ebf7e911..87e38bdf4c487d277842512e96bcfa1f21eb37f1 100644 --- a/app/src/main/res/layout/setup_user_channels.xml +++ b/app/src/main/res/layout/setup_user_channels.xml @@ -27,8 +27,8 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/channelsWrapper" - android:layout_width="match_parent" style="@style/Widget.CustomTextInput" + android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/label_channels" tools:ignore="LabelFor"> diff --git a/app/src/main/res/layout/setup_user_identity.xml b/app/src/main/res/layout/setup_user_identity.xml index 424d81f77b500cb6d8dff33416149f5aa1d4cc00..a28f988048c459205115c4e26da6a0e27e5c45cc 100644 --- a/app/src/main/res/layout/setup_user_identity.xml +++ b/app/src/main/res/layout/setup_user_identity.xml @@ -27,10 +27,10 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/nickWrapper" + style="@style/Widget.CustomTextInput" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/settings_identity_nick" - style="@style/Widget.CustomTextInput" tools:ignore="LabelFor"> <com.google.android.material.textfield.TextInputEditText @@ -43,10 +43,10 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/realnameWrapper" + style="@style/Widget.CustomTextInput" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/settings_identity_real_name" - style="@style/Widget.CustomTextInput" app:passwordToggleEnabled="true" tools:ignore="LabelFor"> diff --git a/app/src/main/res/layout/setup_user_network.xml b/app/src/main/res/layout/setup_user_network.xml index 5fae833a33d14d8a950925259cdb3a7025213c04..a3b1540a647d1d316a62f0ab53e24a20035faddd 100644 --- a/app/src/main/res/layout/setup_user_network.xml +++ b/app/src/main/res/layout/setup_user_network.xml @@ -47,10 +47,10 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/nameWrapper" + style="@style/Widget.CustomTextInput" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/settings_network_network_name" - style="@style/Widget.CustomTextInput" tools:ignore="LabelFor"> <com.google.android.material.textfield.TextInputEditText @@ -63,10 +63,10 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/hostWrapper" + style="@style/Widget.CustomTextInput" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/settings_networkserver_host" - style="@style/Widget.CustomTextInput" tools:ignore="LabelFor"> <com.google.android.material.textfield.TextInputEditText @@ -79,11 +79,11 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/portWrapper" + style="@style/Widget.CustomTextInput" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/settings_networkserver_port" app:passwordToggleEnabled="true" - style="@style/Widget.CustomTextInput" tools:ignore="LabelFor"> <com.google.android.material.textfield.TextInputEditText diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ce8e81418460ad5c498bcd6b714c73bb2988590e..a13cd449fb17217b198cd9d64f02b1c7fee460dc 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -46,6 +46,7 @@ <string name="label_copy">Copia</string> <string name="label_crashes">Arresti anomali</string> <string name="label_crashes_empty">Nessun rapporto di arresto anomalo trovato</string> + <string name="label_create_channel">Crea canale</string> <string name="label_delete">Elimina</string> <string name="label_delete_all">Elimina tutto</string> <string name="label_descending">Discendente</string> @@ -102,6 +103,7 @@ <string name="label_privacy_policy">Informativa privacy</string> <string name="label_query">Privato</string> <string name="label_query_long">Apri conversazione privata con l’utente</string> + <string name="label_query_medium">Apri conversazione privata</string> <string name="label_rename">Rinomina</string> <string name="label_reply">Rispondi</string> <string name="label_reset">Reimposta</string> diff --git a/app/src/main/res/values-it/strings_info.xml b/app/src/main/res/values-it/strings_info.xml index 60c6ad0ba378dce6ddea642f6879ae2f7b81201f..f43932a65b550d2a419b20d02b37f229da9c5848 100644 --- a/app/src/main/res/values-it/strings_info.xml +++ b/app/src/main/res/values-it/strings_info.xml @@ -25,6 +25,8 @@ <string name="label_user_ident">Ident</string> <string name="label_user_host">Host</string> <string name="label_user_server">Server</string> + <string name="label_user_common_channels">Canali in comune</string> + <string name="label_core_version">Versione</string> <string name="label_core_uptime">Tempo di attività</string> <string name="label_core_security">Sicurezza</string> diff --git a/app/src/main/res/values-it/strings_preferences.xml b/app/src/main/res/values-it/strings_preferences.xml index 04416d2e473f30f5dced6f433f30ea9d176b556d..5756d6a29317ca45153459cd13272d934b85e772 100644 --- a/app/src/main/res/values-it/strings_preferences.xml +++ b/app/src/main/res/values-it/strings_preferences.xml @@ -158,6 +158,8 @@ <string name="preference_initial_amount_title">Quantità iniziale</string> <string name="preference_initial_amount_summary">Numero di messaggi da caricare all’apertura di una chat la prima volta</string> + <string name="preference_clear_cache_title">Cancella cache registro storico</string> + <string name="preference_connection_title">Connessione</string> <string name="preference_show_notification_title">Mostra notifica</string> diff --git a/app/src/main/res/values/styles_widgets.xml b/app/src/main/res/values/styles_widgets.xml index e7f21f7f8832dca8d9ec181f9d48d76deb29e18c..20bb9617882996d5929be74f31e1329225284a8f 100644 --- a/app/src/main/res/values/styles_widgets.xml +++ b/app/src/main/res/values/styles_widgets.xml @@ -18,6 +18,7 @@ --> <resources> + <style name="Widget" /> <style name="Widget.RtlConformTextView" parent="" />