Merge branch 'master' of https://github.com/esteemapp/esteem-mobile into feature/schedules-2

This commit is contained in:
u-e 2019-04-13 12:23:45 +03:00
commit e5f10e189e
7 changed files with 68 additions and 57 deletions

View File

@ -63,6 +63,7 @@ class CommentView extends PureComponent {
name={comment.author}
reputation={comment.author_reputation}
size={avatarSize || 24}
isShowOwnerIndicator={currentAccountUsername === comment.author}
/>
<View style={[{ marginLeft: marginLeft || 29 }, styles.bodyWrapper]}>
<PostBody isComment handleOnUserPress={handleOnUserPress} body={comment.body} />

View File

@ -32,7 +32,7 @@ class PostHeaderDescription extends PureComponent {
}
// Component Functions
_handleOnUserPress = (username) => {
_handleOnUserPress = username => {
const { navigation, profileOnPress, reputation } = this.props;
if (profileOnPress) {
@ -51,7 +51,14 @@ class PostHeaderDescription extends PureComponent {
render() {
const {
date, isHideImage, name, reputation, size, tag, tagOnPress,
date,
isHideImage,
name,
reputation,
size,
tag,
tagOnPress,
isShowOwnerIndicator,
} = this.props;
const { reblogedBy } = this.state;
@ -81,13 +88,12 @@ class PostHeaderDescription extends PureComponent {
</TouchableOpacity>
)}
<Text style={styles.date}>{date}</Text>
{isShowOwnerIndicator && (
<Icon style={styles.ownerIndicator} name="stars" iconType="MaterialIcons" />
)}
{!!reblogedBy && (
// <TextWithIcon text={reblogedBy} iconType="MaterialIcons" iconName="repeat" />
<Icon
style={styles.reblogedIcon}
name="repeat"
iconType="MaterialIcons"
/>
<Icon style={styles.reblogedIcon} name="repeat" iconType="MaterialIcons" />
)}
</View>
);

View File

@ -37,4 +37,9 @@ export default EStyleSheet.create({
marginLeft: 10,
alignSelf: 'center',
},
ownerIndicator: {
color: '$primaryBlue',
alignSelf: 'center',
marginLeft: 8,
},
});

View File

@ -19,7 +19,7 @@
"unfollow": "आपका साथ छोड़ा",
"ignore": "आपको अनदेखा किया",
"reblog": "आपका पोस्ट को पुनः प्रसारित किया",
"transfer": "transfered steem",
"transfer": "steem स्थानांतरण",
"comingsoon": "अधिनायक पटल सुविधा जल्द आने वाली है!",
"notification": "अधिसूचनाएं",
"leaderboard": "अधिनायकपटल",
@ -58,33 +58,33 @@
},
"settings": {
"settings": "समायोजन",
"general": "General",
"general": "सामान्य",
"currency": "मुद्रा",
"language": "भाषा",
"server": "सर्वर",
"dark_theme": "काला थीम",
"push_notification": "संभर अधिसूचना",
"notification": {
"follow": "Follow",
"vote": "Vote",
"comment": "Comment",
"mention": "Mention",
"follow": "का पालन करें",
"vote": "वोट",
"comment": "टिप्पणी",
"mention": "उल्लेख",
"reblog": "Reblog",
"transfers": "Transfers"
"transfers": "स्थानांतरण"
},
"pincode": "Pincode",
"reset": "पुनः नियोजन",
"nsfw_content": "NSFW Content",
"send_feedback": "Send Feedback",
"send": "Send",
"nsfw_content": "NSFW सामग्री",
"send_feedback": "प्रतिक्रिया भेजें",
"send": "भेजना",
"default_footer": "Default Footer",
"nsfw": {
"always_show": "Always show",
"always_hide": "Always hide",
"always_warn": "Always warn"
"always_show": "हमेशा दिखाएं",
"always_hide": "हमेशा छिपाए",
"always_warn": "हमेशा चेतावनी देते हैं"
},
"feedback_success": "Email successfully open",
"feedback_fail": "Email client could not open"
"feedback_success": "ईमेल सफलतापूर्वक खुला",
"feedback_fail": "ईमेल क्लाइंट नहीं खोल सका"
},
"voters": {
"voters_info": "मतदाताओं की जानकारी",
@ -159,7 +159,7 @@
"invalid_pincode": "Invalid pin code, please check and try again.",
"remove_alert": "क्या आप इसे सच में हटाना चाहते हैं?",
"clear_alert": "क्या आप सचमुच में मिटाना चाहते हैं?",
"clear_user_alert": "Are you sure you want to clear all user data?",
"clear_user_alert": "क्या आप वाकई सभी उपयोगकर्ता डेटा को साफ़ करना चाहते हैं?",
"clear": "मिटायें",
"cancel": "रद्द करें",
"delete": "मिटा दें",
@ -223,13 +223,13 @@
"no_existing_post": "कोई विद्यमान पोस्ट नहीं"
},
"search": {
"posts": "Posts",
"comments": "Comments"
"posts": "पोस्ट",
"comments": "टिप्पणियाँ"
},
"comment_filter": {
"trending": "trending",
"reputation": "reputation",
"votes": "votes",
"age": "age"
"trending": "प्रचलित",
"reputation": "प्रतिष्ठा",
"votes": "मत",
"age": "उम्र"
}
}

View File

@ -19,7 +19,7 @@
"unfollow": "seni takipetmeyi bıraktı",
"ignore": "seni engelledi",
"reblog": "senin postunu paylaştı",
"transfer": "transfered steem",
"transfer": "transfer edilen steem",
"comingsoon": "Liderler tablosu yakında burada!",
"notification": "Bildirimler",
"leaderboard": "Liderler Tablosu",
@ -58,33 +58,33 @@
},
"settings": {
"settings": "Ayarlar",
"general": "General",
"general": "Genel",
"currency": "Para Birimi",
"language": "Dil",
"server": "Sunucu",
"dark_theme": "Koyu Tema",
"push_notification": "Bildirim",
"notification": {
"follow": "Follow",
"vote": "Vote",
"comment": "Comment",
"mention": "Mention",
"reblog": "Reblog",
"transfers": "Transfers"
"follow": "Takip Et",
"vote": "Oy",
"comment": "Yorum",
"mention": "Bahset",
"reblog": "Yeniden yayınla",
"transfers": "Transferler"
},
"pincode": "Pinkod",
"reset": "Sifirla",
"nsfw_content": "NSFW Content",
"send_feedback": "Send Feedback",
"send": "Send",
"default_footer": "Default Footer",
"nsfw_content": "NSFW İçeriği",
"send_feedback": "Geri Bildirim Gönder",
"send": "Gönder",
"default_footer": "Varsayılan Altbilgi",
"nsfw": {
"always_show": "Always show",
"always_hide": "Always hide",
"always_warn": "Always warn"
"always_show": "Her zaman göster",
"always_hide": "Her zaman gizle",
"always_warn": "Her zaman uyar"
},
"feedback_success": "Email successfully open",
"feedback_fail": "Email client could not open"
"feedback_success": "E-posta başarıyla açıldı",
"feedback_fail": "E-posta istemcisi açılamadı"
},
"voters": {
"voters_info": "Oy Verenler",
@ -137,7 +137,7 @@
"publish": "Yayınla",
"reply": "Cevapla",
"open_galery": "Gariyi Aç",
"capture_photo": "Bir fotoğraf yakala"
"capture_photo": "Bir fotoğraf çekin"
},
"pincode": {
"enter_text": "Açmak için pin kodunu giriniz",
@ -159,7 +159,7 @@
"invalid_pincode": "Geçersiz pin gözden geçirip yeniden deneyin.",
"remove_alert": "Kaldırmak istediğine emin misin ?",
"clear_alert": "Silmek istediğinizden emin misiniz?",
"clear_user_alert": "Are you sure you want to clear all user data?",
"clear_user_alert": "Tüm kullanıcı verilerini silmek istediğinize emin misiniz?",
"clear": "Temizle",
"cancel": "Vazgeç",
"delete": "Temizle",
@ -220,11 +220,11 @@
},
"deep_link": {
"no_existing_user": "Kullanici Bulunamadi",
"no_existing_post": "Kullanici Bulunamadi"
"no_existing_post": "Mevcut yayın yok"
},
"search": {
"posts": "Posts",
"comments": "Comments"
"posts": "Gönderi",
"comments": "Yorumlar"
},
"comment_filter": {
"trending": "öne çıkanlar",

View File

@ -129,7 +129,7 @@ class ApplicationContainer extends Component {
}
_fetchApp = async () => {
this._refreshGlobalProps();
await this._refreshGlobalProps();
this._getSettings();
await this._getUserData();
};
@ -211,7 +211,7 @@ class ApplicationContainer extends Component {
await switchAccount(realmObject[0].username);
}
await getUser(realmObject[0].username)
.then(async accountData => {
.then((accountData) => {
dispatch(login(true));
const isExistUser = await getExistUser();
@ -242,8 +242,9 @@ class ApplicationContainer extends Component {
if (response.isDarkTheme !== '') dispatch(isDarkTheme(response.isDarkTheme));
if (response.language !== '') dispatch(setLanguage(response.language));
if (response.server !== '') dispatch(setApi(response.server));
if (response.upvotePercent !== '')
if (response.upvotePercent !== '') {
dispatch(setUpvotePercent(Number(response.upvotePercent)));
}
if (response.isDefaultFooter !== '') dispatch(isDefaultFooter(response.isDefaultFooter));
if (response.notification !== '') {
dispatch(

View File

@ -42,9 +42,7 @@ class ApplicationScreen extends Component {
};
render() {
const {
isConnected, isDarkTheme, locale, toastNotification,
} = this.props;
const { isConnected, isDarkTheme, locale, toastNotification } = this.props;
const { isShowToastNotification } = this.state;
const barStyle = isDarkTheme ? 'light-content' : 'dark-content';
const barColor = isDarkTheme ? '#1e2835' : '#fff';