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

Merge branch 'develop'

This commit is contained in:
tom79 2019-06-01 10:21:08 +02:00
parent 9a218ba5af 839b77b05e
commit 4fb61da98a
6 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -6,8 +6,8 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 28 targetSdkVersion 28
versionCode 276 versionCode 277
versionName "2.3.0" versionName "2.3.1"
multiDexEnabled true multiDexEnabled true
renderscriptTargetApi 28 as int renderscriptTargetApi 28 as int
renderscriptSupportModeEnabled true renderscriptSupportModeEnabled true

4
app/src/main/java/app/fedilab/android/activities/LoginActivity.java
View File

@ -273,6 +273,10 @@ public class LoginActivity extends BaseActivity {
return; return;
} }
instance = login_instance.getText().toString().trim().toLowerCase(); instance = login_instance.getText().toString().trim().toLowerCase();
if(instance.endsWith(".gab.com") || instance.equals("gab.com")){
Toasty.error(LoginActivity.this,getString(R.string.client_error), Toast.LENGTH_LONG).show();
return;
}
connect_button.setEnabled(false); connect_button.setEnabled(false);
new Thread(new Runnable(){ new Thread(new Runnable(){
@Override @Override

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

@ -865,7 +865,7 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
<string name="save_image_failed">No s\'ha pogut desar la imatge</string> <string name="save_image_failed">No s\'ha pogut desar la imatge</string>
<string name="opacity">Opacitat</string> <string name="opacity">Opacitat</string>
<string name="label_crop">Retalla</string> <string name="label_crop">Retalla</string>
<string name="set_photo_editor">Enable photo editor</string> <string name="set_photo_editor">Habilita l\'editor de fotos</string>
<plurals name="number_of_vote"> <plurals name="number_of_vote">
<item quantity="one">%d vot</item> <item quantity="one">%d vot</item>
<item quantity="other">%d vots</item> <item quantity="other">%d vots</item>

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

@ -873,7 +873,7 @@
<string name="save_image_failed">Falha ao salvar imagem.</string> <string name="save_image_failed">Falha ao salvar imagem.</string>
<string name="opacity">Transparência</string> <string name="opacity">Transparência</string>
<string name="label_crop">Recortar</string> <string name="label_crop">Recortar</string>
<string name="set_photo_editor">Enable photo editor</string> <string name="set_photo_editor">Ativar editor de fotos</string>
<plurals name="number_of_vote"> <plurals name="number_of_vote">
<item quantity="one">%d voto</item> <item quantity="one">%d voto</item>
<item quantity="other">%d votos</item> <item quantity="other">%d votos</item>

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

@ -873,7 +873,7 @@
<string name="save_image_failed">Kunde inte spara bilden</string> <string name="save_image_failed">Kunde inte spara bilden</string>
<string name="opacity">Genomskinlighet</string> <string name="opacity">Genomskinlighet</string>
<string name="label_crop">Beskär</string> <string name="label_crop">Beskär</string>
<string name="set_photo_editor">Enable photo editor</string> <string name="set_photo_editor">Aktivera bildeditor</string>
<plurals name="number_of_vote"> <plurals name="number_of_vote">
<item quantity="one">%d röst</item> <item quantity="one">%d röst</item>
<item quantity="other">%d röster</item> <item quantity="other">%d röster</item>

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

@ -841,35 +841,35 @@
<string name="display_timeline">显示时间线</string> <string name="display_timeline">显示时间线</string>
<string name="set_display_bot_icon">在嘟文中标记机器人账户</string> <string name="set_display_bot_icon">在嘟文中标记机器人账户</string>
<string name="add_tags">管理标签</string> <string name="add_tags">管理标签</string>
<string name="set_remember_position">Remember the position in Home timeline</string> <string name="set_remember_position">记住在主时间线中的位置</string>
<string name="history">History</string> <string name="history">历史</string>
<string name="playlists">Playlists</string> <string name="playlists">播放列表</string>
<string name="display_name">Display name</string> <string name="display_name">显示名称</string>
<string name="privacy">Privacy</string> <string name="privacy">隐私</string>
<string name="create">Create</string> <string name="create">创建</string>
<string name="action_playlist_add">You don\'t have any playlists. Click on the \"+\" icon to add a new playlist</string> <string name="action_playlist_add">你没有任何播放列表。 点击\"+\"图标添加一个新的播放列表</string>
<string name="error_display_name">You must provide a display name!</string> <string name="error_display_name">你必须提供显示的名字！</string>
<string name="error_channel_mandatory">The channel is required when the playlist is public.</string> <string name="error_channel_mandatory">当播放列表是公开的时，该频道是需要的。</string>
<string name="action_playlist_create">Create a playlist</string> <string name="action_playlist_create">创建播放列表</string>
<string name="action_playlist_empty_content">There is nothing in this playlist yet.</string> <string name="action_playlist_empty_content">在这个播放列表中还没有任何内容。</string>
<string name="edit_media">Edit media</string> <string name="edit_media">编辑媒体</string>
<string name="redo">redo</string> <string name="redo">重做</string>
<string name="gallery">Gallery</string> <string name="gallery">相册</string>
<string name="label_emoji">Emoji</string> <string name="label_emoji">Emoji 表情</string>
<string name="label_sticker">Sticker</string> <string name="label_sticker">贴纸</string>
<string name="label_eraser">Eraser</string> <string name="label_eraser">橡皮擦</string>
<string name="label_text">Text</string> <string name="label_text">文本</string>
<string name="label_filter">Filter</string> <string name="label_filter">过滤器</string>
<string name="label_adjust">Adjust</string> <string name="label_adjust">调整</string>
<string name="label_brush">Brush</string> <string name="label_brush">画笔</string>
<string name="confirm_exit_editing">Are you sure to exit without saving the image?</string> <string name="confirm_exit_editing">您确定要退出而不保存图像吗？</string>
<string name="discard">Discard</string> <string name="discard">舍弃</string>
<string name="saving">Saving…</string> <string name="saving">正在保存…</string>
<string name="image_saved">Image Saved Successfully!</string> <string name="image_saved">图像保存成功！</string>
<string name="save_image_failed">Failed to save Image</string> <string name="save_image_failed">保存图像失败</string>
<string name="opacity">Opacity</string> <string name="opacity">不透明度</string>
<string name="label_crop">Crop</string> <string name="label_crop">剪裁</string>
<string name="set_photo_editor">Enable photo editor</string> <string name="set_photo_editor">启用照片编辑器</string>
<plurals name="number_of_vote"> <plurals name="number_of_vote">
<item quantity="other">%d 票</item> <item quantity="other">%d 票</item>
</plurals> </plurals>