Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

- Custom Sharing feature fix string compatibility with Crowdin

This commit is contained in:
crockwave 2019-02-14 17:50:05 -06:00
parent c605bff457
commit f05aa0fb2f
6 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/fr/gouv/etalab/mastodon/activities/CustomSharingActivity.java
View File

@ -92,7 +92,7 @@ public class CustomSharingActivity extends BaseActivity implements OnCustomShari
actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
TextView title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
pp_actionBar = actionBar.getCustomView().findViewById(R.id.pp_actionBar);
title.setText(R.string.settings_title_profile);
title.setText(R.string.settings_title_custom_sharing);
ImageView close_conversation = actionBar.getCustomView().findViewById(R.id.close_conversation);
if( close_conversation != null){
close_conversation.setOnClickListener(new View.OnClickListener() {
@ -107,7 +107,7 @@ public class CustomSharingActivity extends BaseActivity implements OnCustomShari
Helper.colorizeToolbar(toolbar, R.color.black, CustomSharingActivity.this);
}
}else{
setTitle(R.string.settings_title_profile);
setTitle(R.string.settings_title_custom_sharing);
}
SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);

4
app/src/main/res/layout-sw600dp/fragment_settings.xml
View File

@ -371,11 +371,11 @@
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="Custom sharing"
android:text="@string/settings_title_custom_sharing"
android:layout_height="wrap_content" />
<EditText
android:hint="Your custom sharing URL..."
android:hint="@string/settings_custom_sharing_url"
android:id="@+id/custom_sharing_url"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

14
app/src/main/res/layout/activity_custom_sharing.xml
View File

@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:paddingBottom="10dp"
android:text="Custom Sharing"
android:text="@string/settings_title_custom_sharing"
android:textSize="18sp" />
@ -50,7 +50,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:paddingTop="10dp"
android:text="Title" />
android:text="@string/title_header_custom_sharing" />
<EditText
android:layout_marginTop="10dp"
android:layout_width="match_parent"
@ -59,7 +59,7 @@
android:minLines="1"
android:lines="1"
android:maxLines="2"
android:hint="Title..."
android:hint="@string/title_hint_custom_sharing"
/>
@ -70,7 +70,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:paddingTop="10dp"
android:text="Description" />
android:text="@string/description_header_custom_sharing" />
<EditText
android:layout_marginTop="10dp"
android:layout_width="match_parent"
@ -79,7 +79,7 @@
android:minLines="4"
android:lines="4"
android:maxLines="5"
android:hint="Description..."
android:hint="@string/description_hint_custom_sharing"
/>
@ -90,7 +90,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:paddingTop="10dp"
android:text="Keywords" />
android:text="@string/keywords_header_custom_sharing" />
<EditText
android:layout_marginTop="10dp"
android:layout_width="match_parent"
@ -99,7 +99,7 @@
android:minLines="1"
android:lines="1"
android:maxLines="1"
android:hint="Keywords..."
android:hint="@string/keywords_hint_custom_sharing"
/>

4
app/src/main/res/layout/fragment_settings.xml
View File

@ -376,11 +376,11 @@
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="Custom sharing"
android:text="@string/settings_title_custom_sharing"
android:layout_height="wrap_content" />
<EditText
android:hint="Your custom sharing URL..."
android:hint="@string/settings_custom_sharing_url"
android:id="@+id/custom_sharing_url"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/menu/option_toot.xml
View File

@ -24,7 +24,7 @@
app:showAsAction="never" />
<item
android:id="@+id/action_custom_sharing"
android:title="Custom Sharing"
android:title="@string/settings_title_custom_sharing"
app:showAsAction="never" />
<item
android:id="@+id/action_copy_link"

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

@ -330,6 +330,8 @@
<string name="set_night_mode">Night mode</string>
<string name="set_nsfw_timeout">NSFW view timeout (seconds, 0 means off)</string>
<string name="settings_title_profile">Edit profile</string>
<string name="settings_title_custom_sharing">Custom sharing</string>
<string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
<string name="set_profile_description">Bio…</string>
<string name="set_lock_account">Lock account</string>
<string name="set_save_changes">Save changes</string>
@ -430,6 +432,13 @@
<string name="cache_units">Mb</string>
<string name="toast_cache_clear">Cache was cleared! %1$s were released</string>
<!-- ACTIVITY CUSTOM SHARING -->
<string name="title_header_custom_sharing">Title</string>
<string name="title_hint_custom_sharing">Title&#8230;</string>
<string name="description_header_custom_sharing">Description</string>
<string name="description_hint_custom_sharing">Description&#8230;</string>
<string name="keywords_header_custom_sharing">Keywords</string>
<string name="keywords_hint_custom_sharing">Keywords&#8230;</string>
<!-- ACTIVITY CACHE -->
<string name="action_sync">Synchronize</string>