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

updated strings, layout fix

This commit is contained in:
nuclearfog 2020-10-28 10:09:28 +01:00
parent 54fd380081
commit 2cbd2f1858
No known key found for this signature in database
GPG Key ID: D5490E4A81F97B14
6 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/nuclearfog/twidda/backend/utils/DialogBuilder.java
View File

@ -48,8 +48,8 @@ public final class DialogBuilder {
* @return dialog instance * @return dialog instance
*/ */
public static Dialog create(Context context, final DialogType type, final OnDialogClick listener) { public static Dialog create(Context context, final DialogType type, final OnDialogClick listener) {
int posButton = R.string.confirm_yes; int posButton = android.R.string.yes;
int negButton = R.string.confirm_no; int negButton = android.R.string.no;
int title = 0; int title = 0;
int message = 0; int message = 0;

3
app/src/main/res/layout/item_user.xml
View File

@ -53,6 +53,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="@dimen/useritem_margin_layout"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
@ -62,6 +63,7 @@
android:layout_weight="1" android:layout_weight="1"
android:drawablePadding="@dimen/useritem_padding_drawable" android:drawablePadding="@dimen/useritem_padding_drawable"
android:singleLine="true" android:singleLine="true"
android:textSize="@dimen/useritem_textsize_small"
app:drawableStartCompat="@drawable/following" /> app:drawableStartCompat="@drawable/following" />
<TextView <TextView
@ -71,6 +73,7 @@
android:layout_weight="1" android:layout_weight="1"
android:drawablePadding="@dimen/useritem_padding_drawable" android:drawablePadding="@dimen/useritem_padding_drawable"
android:singleLine="true" android:singleLine="true"
android:textSize="@dimen/useritem_textsize_small"
app:drawableStartCompat="@drawable/follower" /> app:drawableStartCompat="@drawable/follower" />
</LinearLayout> </LinearLayout>

52
app/src/main/res/layout/page_profile.xml
View File

@ -169,30 +169,38 @@
android:maxLines="@integer/profile_text_bio_lines" android:maxLines="@integer/profile_text_bio_lines"
android:scrollbars="vertical" /> android:scrollbars="vertical" />
<TextView <LinearLayout
android:id="@+id/location"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/profile_tv_margin" android:orientation="horizontal">
android:layout_marginRight="@dimen/profile_tv_margin"
android:drawablePadding="@dimen/profile_padding_drawable"
android:singleLine="true"
android:textSize="@dimen/profile_textsize_small"
app:drawableLeftCompat="@drawable/userlocation"
app:drawableStartCompat="@drawable/userlocation" />
<TextView <TextView
android:id="@+id/links" android:id="@+id/location"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/profile_tv_margin" android:layout_marginLeft="@dimen/profile_tv_margin"
android:layout_marginRight="@dimen/profile_tv_margin" android:layout_marginRight="@dimen/profile_tv_margin"
android:drawablePadding="@dimen/profile_padding_drawable" android:layout_weight="1"
android:linksClickable="true" android:drawablePadding="@dimen/profile_padding_drawable"
android:singleLine="true" android:singleLine="true"
android:textSize="@dimen/profile_textsize_small" android:textSize="@dimen/profile_textsize_small"
app:drawableLeftCompat="@drawable/link" app:drawableLeftCompat="@drawable/userlocation"
app:drawableStartCompat="@drawable/link" /> app:drawableStartCompat="@drawable/userlocation" />
<TextView
android:id="@+id/links"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/profile_tv_margin"
android:layout_marginRight="@dimen/profile_tv_margin"
android:layout_weight="1"
android:drawablePadding="@dimen/profile_padding_drawable"
android:linksClickable="true"
android:singleLine="true"
android:textSize="@dimen/profile_textsize_small"
app:drawableLeftCompat="@drawable/link"
app:drawableStartCompat="@drawable/link" />
</LinearLayout>
<TextView <TextView
android:id="@+id/profile_date" android:id="@+id/profile_date"

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

@ -7,7 +7,7 @@
<string name="confirm_retry">wiederholen</string> <string name="confirm_retry">wiederholen</string>
<string name="color_settings">Farbeinstellungen</string> <string name="color_settings">Farbeinstellungen</string>
<string name="data_consumption">Datenverbrauch</string> <string name="data_consumption">Datenverbrauch</string>
<string name="trend_setting">Trendeinstellung</string> <string name="trend_setting">Trend Standort</string>
<string name="register_link">PIN aufrufen</string> <string name="register_link">PIN aufrufen</string>
<string name="profile_image">Profilbild</string> <string name="profile_image">Profilbild</string>
<string name="settings">Einstellungen</string> <string name="settings">Einstellungen</string>
@ -48,8 +48,6 @@
<string name="settings_logout">Ausloggen</string> <string name="settings_logout">Ausloggen</string>
<string name="dm_answer">Antworten</string> <string name="dm_answer">Antworten</string>
<string name="delete_dm">löschen</string> <string name="delete_dm">löschen</string>
<string name="confirm_yes">Ja</string>
<string name="confirm_no">Nein</string>
<string name="confirm_cancel_tweet">Tweet verwerfen?</string> <string name="confirm_cancel_tweet">Tweet verwerfen?</string>
<string name="confirm_log_lout">ausloggen?</string> <string name="confirm_log_lout">ausloggen?</string>
<string name="confirm_unfollow">User entfolgen?</string> <string name="confirm_unfollow">User entfolgen?</string>
@ -59,7 +57,7 @@
<string name="send_tweet">Tweet senden</string> <string name="send_tweet">Tweet senden</string>
<string name="tweet_add_image">Bild hinzufügen</string> <string name="tweet_add_image">Bild hinzufügen</string>
<string name="image_preview">Bildvorschau</string> <string name="image_preview">Bildvorschau</string>
<string name="menu_link_to_clipboard">Link in Zwischenablage kopieren</string> <string name="menu_link_to_clipboard">Tweet Link kopieren</string>
<string name="info_clipboard">Link in Zwischenablage kopiert!</string> <string name="info_clipboard">Link in Zwischenablage kopiert!</string>
<string name="profile_link">Link</string> <string name="profile_link">Link</string>
<string name="image_preview_button">Bildvorschau Button</string> <string name="image_preview_button">Bildvorschau Button</string>
@ -97,8 +95,6 @@
<string name="login_pin">PIN eingeben</string> <string name="login_pin">PIN eingeben</string>
<string name="enter_proxy">Proxy IP Adresse</string> <string name="enter_proxy">Proxy IP Adresse</string>
<string name="edit_proxyuser">Nutzername</string> <string name="edit_proxyuser">Nutzername</string>
<string name="app_name">Shitter</string>
<string name="tweet">Tweet</string>
<string name="proxy_password">Passwort</string> <string name="proxy_password">Passwort</string>
<string name="error_dm_send">Direktnachricht konnte nicht an diesen Nutzer gesendet werden!</string> <string name="error_dm_send">Direktnachricht konnte nicht an diesen Nutzer gesendet werden!</string>
<string name="confirm_mute">User stummschalten?</string> <string name="confirm_mute">User stummschalten?</string>

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

@ -95,6 +95,7 @@
<dimen name="useritem_margin_layout">5dp</dimen> <dimen name="useritem_margin_layout">5dp</dimen>
<dimen name="useritem_padding_drawable">5dp</dimen> <dimen name="useritem_padding_drawable">5dp</dimen>
<dimen name="useritem_button_size">36dp</dimen> <dimen name="useritem_button_size">36dp</dimen>
<dimen name="useritem_textsize_small">12sp</dimen>
<!--dimens of item_list.xml--> <!--dimens of item_list.xml-->
<dimen name="listitem_padding">5dp</dimen> <dimen name="listitem_padding">5dp</dimen>

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

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">Shitter</string> <string name="app_name" translatable="false">Shitter</string>
<string name="profile_image">profile image</string> <string name="profile_image">profile image</string>
<string name="login_pin">Enter PIN</string> <string name="login_pin">Enter PIN</string>
<string name="login_verifier">login</string> <string name="login_verifier">login</string>
<string name="tweet">Tweet</string> <string name="tweet" translatable="false">Tweet</string>
<string name="settings">Settings</string> <string name="settings">Settings</string>
<string name="userlist_following" translatable="false">Following</string> <string name="userlist_following" translatable="false">Following</string>
<string name="userlist_follower" translatable="false">Follower</string> <string name="userlist_follower" translatable="false">Follower</string>
@ -18,17 +18,17 @@
<string name="confirm_retry">retry</string> <string name="confirm_retry">retry</string>
<string name="color_settings">Color settings</string> <string name="color_settings">Color settings</string>
<string name="data_consumption">data consumption</string> <string name="data_consumption">data consumption</string>
<string name="trend_setting">trend setting</string> <string name="trend_setting">Trend location</string>
<string name="register_link">get PIN</string> <string name="register_link">get PIN</string>
<string name="settings_image">load images</string> <string name="settings_image">load images</string>
<string name="settings_clear_data">Clear app data</string> <string name="settings_clear_data">Clear app data</string>
<string name="confirm_delete_tweet">delete tweet?</string> <string name="confirm_delete_tweet">delete tweet?</string>
<string name="confirm_delete_database">delete database?</string> <string name="confirm_delete_database">delete database?</string>
<string name="user_unfollow">unfollow</string> <string name="user_unfollow">unfollow</string>
<string name="user_unblock">unblock</string> <string name="user_unblock">unblock user</string>
<string name="tweet_answering">answering</string> <string name="tweet_answering">answering</string>
<string name="tweet_sent_from">sent from:</string> <string name="tweet_sent_from">sent from:</string>
<string name="user_unmute">un-mute</string> <string name="user_unmute">un-mute user</string>
<string name="directmessage">Direct Message</string> <string name="directmessage">Direct Message</string>
<string name="username">username</string> <string name="username">username</string>
<string name="dm_message">Message</string> <string name="dm_message">Message</string>
@ -36,8 +36,6 @@
<string name="settings_logout">log out</string> <string name="settings_logout">log out</string>
<string name="dm_answer">answer</string> <string name="dm_answer">answer</string>
<string name="delete_dm">delete</string> <string name="delete_dm">delete</string>
<string name="confirm_yes">Yes</string>
<string name="confirm_no">No</string>
<string name="confirm_unfollow">unfollow user?</string> <string name="confirm_unfollow">unfollow user?</string>
<string name="confirm_block">block user?</string> <string name="confirm_block">block user?</string>
<string name="confirm_log_lout">log out?</string> <string name="confirm_log_lout">log out?</string>
@ -51,7 +49,7 @@
<string name="close_dm">close direct message</string> <string name="close_dm">close direct message</string>
<string name="follow_requested">follow requested</string> <string name="follow_requested">follow requested</string>
<string name="profile_location">location</string> <string name="profile_location">location</string>
<string name="profile_bio">bio</string> <string name="profile_bio">Bio</string>
<string name="confirm_discard">discard changes?</string> <string name="confirm_discard">discard changes?</string>
<string name="user_data">User data</string> <string name="user_data">User data</string>
<string name="follows_you">follows you</string> <string name="follows_you">follows you</string>
@ -181,13 +179,13 @@
<string name="menu_follow_user">follow user</string> <string name="menu_follow_user">follow user</string>
<string name="menu_goto_lists">Userlists</string> <string name="menu_goto_lists">Userlists</string>
<string name="menu_app_info" translatable="false">App info</string> <string name="menu_app_info" translatable="false">App info</string>
<string name="menu_block_user">Block</string> <string name="menu_block_user">block user</string>
<string name="menu_tweet_delete">Delete</string> <string name="menu_tweet_delete">Delete</string>
<string name="menu_tweet_open_browser">Open in Browser</string> <string name="menu_tweet_open_browser">Open in Browser</string>
<string name="menu_mute_user">mute</string> <string name="menu_mute_user">mute user</string>
<string name="menu_edit_profile">Edit Profile</string> <string name="menu_edit_profile">Edit Profile</string>
<string name="menu_edit_save">save</string> <string name="menu_edit_save">save</string>
<string name="menu_add_user">add user to list</string> <string name="menu_add_user">add user to list</string>
<string name="menu_edit_list">Edit list</string> <string name="menu_edit_list">Edit list</string>
<string name="menu_link_to_clipboard">copy link to clipboard</string> <string name="menu_link_to_clipboard">copy tweet link</string>
</resources> </resources>