Mastodon
/
Shitter-android-app
mirror of https://github.com/nuclearfog/Shitter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

filter dialog layout fix, bug fix, code cleanup, removed duplicate strings

This commit is contained in:
nuclearfog 2023-10-25 13:21:15 +02:00
parent 11512a303f
commit 13d841c1fd
No known key found for this signature in database
GPG Key ID: 03488A185C476379
20 changed files with 61 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/nuclearfog/twidda/ui/activities/AccountActivity.java
View File

@ -82,7 +82,7 @@ public class AccountActivity extends AppCompatActivity implements ActivityResult
fragmentTransaction.replace(R.id.page_fragment_container, AccountFragment.class, null);
fragmentTransaction.commit();
tool.setTitle(R.string.account_page);
tool.setTitle(R.string.menu_select_account);
setSupportActionBar(tool);
settings = GlobalSettings.get(this);

2
app/src/main/java/org/nuclearfog/twidda/ui/activities/EditHistoryActivity.java
View File

@ -31,7 +31,7 @@ public class EditHistoryActivity extends AppCompatActivity {
fragmentTransaction.replace(R.id.page_fragment_container, EditHistoryFragment.class, getIntent().getExtras());
fragmentTransaction.commit();
toolbar.setTitle(R.string.toolbar_status_history);
toolbar.setTitle(R.string.menu_status_history);
setSupportActionBar(toolbar);
AppStyles.setTheme(root);
}

2
app/src/main/java/org/nuclearfog/twidda/ui/activities/ProfileEditor.java
View File

@ -123,7 +123,7 @@ public class ProfileEditor extends MediaActivity implements OnClickListener, Asy
settings = GlobalSettings.get(this);
picasso = PicassoBuilder.get(this);
toolbar.setTitle(R.string.page_profile_editor);
toolbar.setTitle(R.string.menu_edit_profile);
setSupportActionBar(toolbar);
if (!settings.toolbarOverlapEnabled()) {

2
app/src/main/java/org/nuclearfog/twidda/ui/activities/ScheduleActivity.java
View File

@ -40,7 +40,7 @@ public class ScheduleActivity extends AppCompatActivity implements OnClickListen
if (settings.floatingButtonEnabled()) {
floatingButton.setVisibility(View.VISIBLE);
}
toolbar.setTitle(R.string.toolbar_schedule_title);
toolbar.setTitle(R.string.menu_schedule);
setSupportActionBar(toolbar);
AppStyles.setTheme(root);

2
app/src/main/java/org/nuclearfog/twidda/ui/activities/SettingsActivity.java
View File

@ -168,7 +168,7 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
fontAdapter = new DropdownAdapter(getApplicationContext());
scaleAdapter = new DropdownAdapter(getApplicationContext());
toolbar.setTitle(R.string.title_settings);
toolbar.setTitle(R.string.menu_open_settings);
setSupportActionBar(toolbar);
AppStyles.setTheme(root);
AppStyles.setOverflowIcon(toolbar, settings.getIconColor());

2
app/src/main/java/org/nuclearfog/twidda/ui/activities/UsersActivity.java
View File

@ -175,7 +175,7 @@ public class UsersActivity extends AppCompatActivity implements OnTabSelectedLis
break;
case USERS_EXCLUDED:
toolbar.setTitle(R.string.menu_toolbar_excluded_users);
toolbar.setTitle(R.string.menu_excluded_users);
adapter.setType(UserAdapter.BLOCKS);
adapter.setPageCount(3);
viewPager.setAdapter(adapter);

2
app/src/main/java/org/nuclearfog/twidda/ui/dialogs/FilterDialog.java
View File

@ -117,7 +117,7 @@ public class FilterDialog extends Dialog implements OnClickListener, OnCheckedCh
}
// create new filter
else {
title.setText(R.string.dialog_filter_create);
title.setText(R.string.dialog_title_create_filter);
txt_keywords.setText("");
}
sw_home.setCheckedImmediately(update.filterHomeSet());

4
app/src/main/java/org/nuclearfog/twidda/ui/views/LockableConstraintLayout.java
View File

@ -52,9 +52,7 @@ public class LockableConstraintLayout extends ConstraintLayout {
yPos = ev.getAxisValue(MotionEvent.AXIS_Y);
break;
case MotionEvent.ACTION_POINTER_UP:
case MotionEvent.ACTION_CANCEL:
case MotionEvent.ACTION_UP:
default:
yLock = false;
break;
}

35
app/src/main/res/layout/dialog_filter.xml
View File

@ -12,7 +12,7 @@
android:id="@+id/dialog_filter_title_dialog"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/dialog_filter_create"
android:text="@string/dialog_title_create_filter"
android:lines="1"
android:textSize="@dimen/dialog_filter_textsize_title"
android:layout_margin="@dimen/dialog_filter_margin_items_layout"
@ -20,6 +20,20 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<TextView
android:id="@+id/dialog_filter_name_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:lines="1"
android:text="@string/dialog_filter_title_name"
android:textSize="@dimen/dialog_filter_textsize_title_sub"
android:layout_marginTop="@dimen/dialog_filter_margin_columns"
android:layout_marginStart="@dimen/dialog_filter_margin_items_layout"
android:layout_marginEnd="@dimen/dialog_filter_margin_items_layout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/dialog_filter_title_dialog"
app:layout_constraintEnd_toEndOf="parent" />
<EditText
android:id="@+id/dialog_filter_name"
android:layout_width="0dp"
@ -30,8 +44,9 @@
android:background="@android:color/transparent"
android:inputType="text"
android:importantForAutofill="no"
android:textSize="@dimen/dialog_filter_textsize_input"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/dialog_filter_title_dialog"
app:layout_constraintTop_toBottomOf="@id/dialog_filter_name_title"
app:layout_constraintEnd_toEndOf="parent" />
<TextView
@ -41,7 +56,9 @@
android:text="@string/dialog_filter_apply"
android:lines="1"
android:textSize="@dimen/dialog_filter_textsize_title_sub"
android:layout_margin="@dimen/dialog_filter_margin_items_layout"
android:layout_marginTop="@dimen/dialog_filter_margin_columns"
android:layout_marginStart="@dimen/dialog_filter_margin_items_layout"
android:layout_marginEnd="@dimen/dialog_filter_margin_items_layout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/dialog_filter_name"
app:layout_constraintEnd_toEndOf="parent" />
@ -191,7 +208,9 @@
android:layout_height="wrap_content"
android:text="@string/dialog_filter_title_keywords"
android:textSize="@dimen/dialog_filter_textsize_title_sub"
android:layout_margin="@dimen/dialog_filter_margin_items_layout"
android:layout_marginTop="@dimen/dialog_filter_margin_columns"
android:layout_marginStart="@dimen/dialog_filter_margin_items_layout"
android:layout_marginEnd="@dimen/dialog_filter_margin_items_layout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/dialog_filter_switch_thread"
app:layout_constraintEnd_toEndOf="parent" />
@ -209,6 +228,7 @@
android:gravity="top"
android:layout_margin="@dimen/dialog_filter_margin_items_layout"
android:inputType="textMultiLine"
android:textSize="@dimen/dialog_filter_textsize_input"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/dialog_filter_title_keywords"
app:layout_constraintEnd_toEndOf="parent"
@ -219,10 +239,11 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:hint="@string/dialog_poll_duration_hint"
android:hint="@string/hint_duration"
android:inputType="numberDecimal"
android:maxLength="3"
android:autofillHints=""
android:layout_margin="@dimen/dialog_filter_margin_items_layout"
app:layout_constraintHorizontal_weight="2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/dialog_filter_keywords"
@ -232,6 +253,7 @@
android:id="@+id/dialog_filter_timeunit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dialog_filter_margin_items_layout"
app:layout_constraintHorizontal_weight="3"
app:layout_constraintStart_toEndOf="@id/dialog_filter_time"
app:layout_constraintTop_toBottomOf="@id/dialog_filter_keywords"
@ -246,7 +268,8 @@
android:layout_margin="@dimen/dialog_filter_margin_items_layout"
app:layout_constraintHorizontal_weight="2"
app:layout_constraintStart_toEndOf="@id/dialog_filter_timeunit"
app:layout_constraintTop_toBottomOf="@id/dialog_filter_keywords"
app:layout_constraintTop_toTopOf="@id/dialog_filter_timeunit"
app:layout_constraintBottom_toBottomOf="@id/dialog_filter_timeunit"
app:layout_constraintEnd_toEndOf="parent"
style="@style/FeedbackButton" />

2
app/src/main/res/layout/dialog_poll.xml
View File

@ -98,7 +98,7 @@
android:inputType="numberDecimal"
android:maxLength="3"
android:autofillHints=""
android:hint="@string/dialog_poll_duration_hint"
android:hint="@string/hint_duration"
android:layout_marginEnd="@dimen/dialog_poll_layout_margins"
android:textSize="@dimen/dialog_poll_textsize_medium"
android:lines="1"

2
app/src/main/res/layout/dialog_report.xml
View File

@ -84,7 +84,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dialog_report_button_height"
android:padding="@dimen/dialog_report_button_padding"
android:text="@string/dialog_report_apply"
android:text="@string/dialog_apply"
android:layout_margin="@dimen/dialog_report_margin_items_layout"
android:lines="1"
android:textSize="@dimen/dialog_report_textsize_button"

14
app/src/main/res/values-de-rDE/strings.xml
View File

@ -11,7 +11,6 @@
<string name="profile_image">Profilbild</string>
<string name="settings_image">Bilder laden</string>
<string name="settings_clear_data">Daten löschen</string>
<string name="title_settings">Einstellungen</string>
<string name="toolbar_userlist_repost">Status geteilt von</string>
<string name="settings_background">Hintergrund</string>
<string name="confirm_delete_status">Status löschen?</string>
@ -112,7 +111,6 @@
<string name="edit_description_hint">Profilebeschreibung eingeben</string>
<string name="edit_hint_link">Link eingeben</string>
<string name="edit_location_hint">Standortnamen eingeben</string>
<string name="page_profile_editor">Profil bearbeiten</string>
<string name="error_no_card_app">Keine Karten App gefunden!</string>
<string name="error_no_media_app">Keine Galerie App gefunden!</string>
<string name="delete_list">Liste löschen</string>
@ -140,7 +138,7 @@
<string name="status_spoiler_hint">Zum Anzeigen tippen</string>
<string name="login_info">4 Schritte zum Login</string>
<string name="userlist_enter_title">Titel eingeben</string>
<string name="userlist_create">erstellen</string>
<string name="userlist_create">Liste erstellen</string>
<string name="error_list_title_empty">Titel ist leer!</string>
<string name="info_list_updated">Liste wurde aktualisiert</string>
<string name="info_list_created">Liste wurde erstellt</string>
@ -158,7 +156,6 @@
<string name="menu_open_filter">Filter verwalten</string>
<string name="menu_open_settings">Einstellungen</string>
<string name="menu_create_list">erstelle Nutzerliste</string>
<string name="toolbar_status_history">Bearbeitungsverlauf</string>
<string name="time_now">jetzt</string>
<string name="menu_follow_user">folgen</string>
<string name="menu_goto_lists">Nutzerlisten</string>
@ -184,7 +181,6 @@
<string name="settings_enable_floating_button">Floating-Button aktivieren</string>
<string name="settings_look">Aussehen</string>
<string name="dialog_link_image_preview">Linkvorschau Bild</string>
<string name="account_page">Accounts</string>
<string name="toolbar_title_filter">Status-Filter</string>
<string name="status_translate_text">übersetzen</string>
<string name="field_verified">verifiziert:\u0020</string>
@ -237,7 +233,6 @@
<string name="descr_remove_domain">entferne Domain von der Liste</string>
<string name="confirm_unknown_error">Unbekannter Fehler!</string>
<string name="error_invalid_media">Ungültige Mediendatei!</string>
<string name="menu_toolbar_excluded_users">Blocklisten</string>
<string name="info_status_location_copied">Standortkoordinaten kopiert</string>
<string name="settings_enable_indicators">zeige zusätzliche Status Informationen an</string>
<string name="login_key_enable">Token einfügen</string>
@ -271,11 +266,12 @@
<string name="notification_dismiss">Benachrichtigung verwerfen</string>
<string name="dialog_poll_title">Umfrage erstellen</string>
<string name="dialog_poll_button_create">erstellen</string>
<string name="dialog_title_create_filter">Filter erstellen</string>
<string name="dialog_filter_title_name">Filtertitel</string>
<string name="dialog_poll_button_remove">entfernen</string>
<string name="dialog_poll_mc">Mehrfachauswahl</string>
<string name="dialog_poll_hide">Stimmen verstecken</string>
<string name="dialog_poll_option_edit_hint">%1$d. Option</string>
<string name="dialog_poll_duration_hint">Dauer: 1</string>
<string name="poll_option_edit_button">hinzufügen/entfernen</string>
<string name="status_add_poll">Umfrage hinzufügen</string>
<string name="status_pref">Statuseinstellungen</string>
@ -312,7 +308,6 @@
<string name="dialog_report_title_user">Nutzer melden</string>
<string name="dialog_report_category_label">Meldegrund</string>
<string name="dialog_report_title_status">Status melden</string>
<string name="dialog_report_apply">melden</string>
<string name="dialog_meta_title">Medieninformationen</string>
<string name="dialog_meta_width">Breite</string>
<string name="dialog_meta_height">Höhe</string>
@ -338,7 +333,6 @@
<string name="description_filter_public_timeline">Filter für öffentliche Timeline aktiviert</string>
<string name="description_filter_thread">Filter für Threads aktiviert</string>
<string name="description_filter_user_timeline">Filter für Nutzer-Timeline aktiviert</string>
<string name="dialog_filter_create">Filter erstellen</string>
<string name="dialog_filter_name_hint">Filternamen eingeben</string>
<string name="dialog_filter_update">Filter aktualisieren</string>
<string name="dialog_filter_apply">Filter anwenden für</string>
@ -359,7 +353,6 @@
<string name="menu_schedule">geplante Posts</string>
<string name="descr_remove_schedule">geplanten Post von der Liste entfernen</string>
<string name="confirm_schedule_remove">geplanten Post verwerfen?</string>
<string name="toolbar_schedule_title">geplante Posts</string>
<string name="userlist_exclusive">Mitglieder aus den Home-Timeline filtern</string>
<string name="userlist_update_list">Nutzerliste bearbeiten</string>
<string name="confirm_accept_follow_request">Follow-Anfrage annehmen?</string>
@ -367,4 +360,5 @@
<string name="description_show_timeline">öffentl. Timeline</string>
<string name="error_api_error">API Fehler</string>
<string name="menu_status_history">Bearbeitungsverlauf</string>
<string name="hint_duration">Dauer</string>
</resources>

5
app/src/main/res/values-es/strings.xml
View File

@ -141,7 +141,6 @@
<string name="menu_status_copy_text">Texto</string>
<string name="menu_media_link">Enlace de medios</string>
<string name="menu_status_copy_link">Enlace de estado</string>
<string name="menu_toolbar_excluded_users">Lista de bloqueos</string>
<string name="dialog_link_image_preview">Enlazar vista previa de la imagen</string>
<string name="app_info_icons">Iconos SVG de:</string>
<string name="profile_image">Imagen de perfil</string>
@ -150,7 +149,6 @@
<string name="login_key_enable_v2">Usar API v2</string>
<string name="login_verifier">Acceder</string>
<string name="popup_status_text_hint">Estadp</string>
<string name="title_settings">Configuración</string>
<string name="toolbar_userlist_repost">Estado re-publicado por</string>
<string name="settings_color_settings">Configuración de color</string>
<string name="settings_background">Fondo</string>
@ -198,7 +196,6 @@
<string name="dialog_poll_mc">Opción múltiple</string>
<string name="dialog_poll_hide">Ocultar votos</string>
<string name="dialog_poll_option_edit_hint">Opción %1$d</string>
<string name="dialog_poll_duration_hint">Duración: 1</string>
<string name="confirm_discard">¿Descartar cambios?</string>
<string name="user_data">Datos del usuario</string>
<string name="follows_you">Te sigue</string>
@ -215,7 +212,6 @@
<string name="edit_location_hint">Ingresar ubicación</string>
<string name="edit_hint_link">Ingresar enlace de sitio web</string>
<string name="edit_description_hint">Ingresar descripción del perfil</string>
<string name="page_profile_editor">Editar perfil</string>
<string name="confirm_delete_list">¿Borrar lista de usuario?</string>
<string name="confirm_unfollow_list">¿No seguir lista?</string>
<string name="trend_range">\u0020Publicaciones</string>
@ -246,7 +242,6 @@
<string name="button_share">Compartir enlace</string>
<string name="settings_rt_icon_color">Re-publicar</string>
<string name="settings_follow_color">Icono de quienes sigues</string>
<string name="account_page">Cuentas</string>
<string name="status_translate_text">Traducir</string>
<string name="status_translate_source">Traducido por:\u0020</string>
<string name="status_translate_source_language">Idioma:\u0020</string>

2
app/src/main/res/values-zh-rCN/strings.xml
View File

@ -3,7 +3,6 @@
<string name="profile_image">头像</string>
<string name="login_pin">输入PIN</string>
<string name="login_verifier">登录</string>
<string name="title_settings">设置</string>
<string name="toolbar_userlist_repost">转推来自</string>
<string name="settings_background">背景颜色</string>
<string name="settings_text">字体颜色</string>
@ -49,7 +48,6 @@
<string name="edit_location_hint">输入位置</string>
<string name="edit_hint_link">输入网站链接</string>
<string name="edit_description_hint">输入简介</string>
<string name="page_profile_editor">编辑个人资料</string>
<string name="delete_list">删除列表</string>
<string name="confirm_delete_list">删除列表？</string>
<string name="enter_username">输入用户名</string>

4
app/src/main/res/values/dimens.xml
View File

@ -340,9 +340,11 @@
<!--dimens of dialog_filter.xml-->
<dimen name="dialog_filter_root_padding">2dp</dimen>
<dimen name="dialog_filter_textsize_title">22sp</dimen>
<dimen name="dialog_filter_textsize_title_sub">16sp</dimen>
<dimen name="dialog_filter_textsize_title_sub">17sp</dimen>
<dimen name="dialog_filter_textsize_input">15sp</dimen>
<dimen name="dialog_filter_textsize_label">11sp</dimen>
<dimen name="dialog_filter_margin_items_layout">4dp</dimen>
<dimen name="dialog_filter_margin_columns">12dp</dimen>
<!--dimens of dialog_report.xml-->
<dimen name="dialog_report_root_padding">2dp</dimen>

16
app/src/main/res/values/strings.xml
View File

@ -133,7 +133,7 @@
<!-- menu icon strings -->
<string name="menu_status">write status</string>
<string name="menu_schedule">scheduled status</string>
<string name="menu_schedule">scheduled posts</string>
<string name="menu_hashtags">Hashtags</string>
<string name="menu_hashtag_follow">follow hashtag</string>
<string name="menu_hashtag_unfollow">unfollow hashtag</string>
@ -178,7 +178,6 @@
<string name="menu_media_link">Media link</string>
<string name="menu_add_filter">create filter</string>
<string name="menu_status_copy_link">Status link</string>
<string name="menu_toolbar_excluded_users">Blocklists</string>
<string name="menu_media_add_description">add description</string>
<string name="menu_media_show_meta">show metadata</string>
<string name="dialog_link_image_preview">Link preview image</string>
@ -189,7 +188,6 @@
<string name="login_key_enable_v2">use API v2</string>
<string name="login_verifier">login</string>
<string name="popup_status_text_hint">what\'s new</string>
<string name="title_settings">Settings</string>
<string name="toolbar_userlist_repost">Status reposted by</string>
<string name="settings_color_settings">Color settings</string>
<string name="settings_background">Background</string>
@ -239,11 +237,12 @@
<string name="connection_discard">discard</string>
<string name="dialog_poll_title">create poll</string>
<string name="dialog_poll_button_create">create</string>
<string name="dialog_title_create_filter">create Filter</string>
<string name="dialog_filter_title_name">Filter title</string>
<string name="dialog_poll_button_remove">remove</string>
<string name="dialog_poll_mc">multiple choice</string>
<string name="dialog_poll_hide">hide votes</string>
<string name="dialog_poll_option_edit_hint">Option %1$d</string>
<string name="dialog_poll_duration_hint">Duration: 1</string>
<string name="confirm_discard">discard changes?</string>
<string name="user_data">User data</string>
<string name="follows_you">follows you</string>
@ -262,7 +261,6 @@
<string name="edit_location_hint">enter location</string>
<string name="edit_hint_link">enter website link</string>
<string name="edit_description_hint">enter profile description</string>
<string name="page_profile_editor">edit profile</string>
<string name="delete_list">delete userlist</string>
<string name="confirm_delete_list">delete userlist?</string>
<string name="confirm_unfollow_list">unfollow list?</string>
@ -289,7 +287,7 @@
<string name="login_info">4 steps to login</string>
<string name="userlist_enter_title">enter list title</string>
<string name="userlist_exclusive">exclude members from home feed</string>
<string name="userlist_create">create</string>
<string name="userlist_create">create userlist</string>
<string name="userlist_update">update</string>
<string name="userlist_create_new_list">create a new userlist</string>
<string name="userlist_update_list">edit userlist</string>
@ -304,7 +302,6 @@
<string name="settings_rt_icon_color">Reposts</string>
<string name="login_app_name_label">custom app name</string>
<string name="settings_follow_color">Following icon</string>
<string name="account_page">Accounts</string>
<string name="toolbar_title_filter">Status filter</string>
<string name="status_translate_text">translate</string>
<string name="status_translate_source">Translated by:\u0020</string>
@ -322,8 +319,6 @@
<string name="account_user_unnamed">\'unnamed\'</string>
<string name="toolbar_status_favoriter">User favoriting this status</string>
<string name="toolbar_status_liker">User liking this status</string>
<string name="toolbar_schedule_title">scheduled Posts</string>
<string name="toolbar_status_history">Edit history</string>
<string name="time_now">now</string>
<string name="status_replyname_empty">Reply</string>
<string name="status_media_preview">Media preview</string>
@ -354,7 +349,6 @@
<string name="dialog_report_title_user">report user</string>
<string name="dialog_report_category_label">what to report</string>
<string name="dialog_report_title_status">report post</string>
<string name="dialog_report_apply">report</string>
<string name="dialog_meta_title">Media information</string>
<string name="dialog_meta_width">width</string>
<string name="dialog_meta_height">height</string>
@ -379,7 +373,6 @@
<string name="description_show_timeline">public timeline</string>
<string name="description_filter_thread">Thread filter enabled</string>
<string name="description_filter_user_timeline">User timeline filter enabled</string>
<string name="dialog_filter_create">create filter</string>
<string name="dialog_filter_name_hint">enter filter name</string>
<string name="dialog_filter_update">update filter</string>
<string name="dialog_filter_apply">apply filter for</string>
@ -391,4 +384,5 @@
<string name="dialog_filter_hide_status">hide posts matching this filter</string>
<string name="dialog_filter_title_keywords">Words to exclude</string>
<string name="dialog_filter_edit_hint_exclude">word anotherword\n\"whole word\"</string>
<string name="hint_duration">Duration</string>
</resources>