CW&visibility icon set

potproject · Dec 12, 2017 · 92589cc · 92589cc
1 parent 954869c
commit 92589cc
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 21 deletions.
diff --git a/app/components/toot.js b/app/components/toot.js
@@ -35,7 +35,7 @@ class Toot extends React.Component {
   render() {
     return (
       <View style={styles.container}>
-        {this.toggleCw()}
+        {this.toggleCwText()}
         <TextInput
           placeholder={I18n.t("toot_placeholder")}
           style={styles.toottext}
@@ -53,10 +53,10 @@ class Toot extends React.Component {
               <FontAwesome name="camera" size={30} />
             </TouchableOpacity>
             <TouchableOpacity style={styles.button} onPress={() => this.setState({ visibilityModal: true })}>
-              <Text style={styles.textvisibility}>{this.state.visibility}</Text>
+              {this.visibilityIconSet()}
             </TouchableOpacity>
             <TouchableOpacity style={styles.button} onPress={() => this.setState({ nsfwFlag: !this.state.nsfwFlag })}>
-              <Text style={styles.textcw}>CW</Text>
+              <Text style={this.toggleCwColor()}>CW</Text>
             </TouchableOpacity>
           </View>
           <View style={styles.tootbuttonview}>
@@ -77,21 +77,30 @@ class Toot extends React.Component {
             <Picker
               selectedValue={this.state.visibility}
               onValueChange={(visibility) => this.setState({ visibility })}>
-              <Picker.Item label="public" value="public" />
-              <Picker.Item label="unlisted" value="unlisted" />
-              <Picker.Item label="private" value="private" />
-              <Picker.Item label="direct" value="direct" />
+              <Picker.Item label={I18n.t("toot_visibility_public")} value="public" />
+              <Picker.Item label={I18n.t("toot_visibility_unlisted")} value="unlisted" />
+              <Picker.Item label={I18n.t("toot_visibility_private")} value="private" />
+              <Picker.Item label={I18n.t("toot_visibility_direct")} value="direct" />
             </Picker>
             <TouchableOpacity onPress={() => this.setState({ visibilityModal: false })}>
-              <Text>OK!</Text>
+              <Text>{I18n.t("global_ok")}</Text>
             </TouchableOpacity>
           </View>
         </Modal>
       </View>
     );
   }
+
+  toggleCwColor() {
+    if (this.state.nsfwFlag) {
+      return [styles.textcw,{color:"#1E90FF"}];
+    } else {
+      return styles.textcw;
+    }
+  }
+
   //warningとtoot、合わせて500文字
-  toggleCw() {
+  toggleCwText() {
     if (this.state.nsfwFlag) {
       return <TextInput
         placeholder={I18n.t("toot_cw_placeholder")}
@@ -105,6 +114,20 @@ class Toot extends React.Component {
       return;
     }
   }
+  visibilityIconSet() {
+    switch(this.state.visibility){
+      case "public":
+        return <FontAwesome name="globe" size={30} color="#1E90FF" />;
+      case "unlisted":
+        return <FontAwesome name="unlock-alt" size={30} color="#1E90FF" />;
+      case "private":
+        return <FontAwesome name="lock" size={30} color="#1E90FF" />;
+      case "direct":
+        return <FontAwesome name="envelope" size={30} color="#1E90FF" />;
+      default: 
+        return <FontAwesome name="globe" size={30} color="#1E90FF" />;
+    }
+  }
 }
 
 const styles = StyleSheet.create({

diff --git a/app/i18n.js b/app/i18n.js
@@ -10,6 +10,8 @@ export default class I18n{
     if(!supported.includes(reactNativeI18n.locale)){
         reactNativeI18n.locale = "en-US";
     }
+    //force Set
+    //reactNativeI18n.locale = "ja-JP";
   }
 
   static t(text) {

diff --git a/app/lang/en-US.js b/app/lang/en-US.js
@@ -20,14 +20,20 @@ export default {
     toot_cw_placeholder: "Write your warning here",
     toot_placeholder: "What is on your mind?",
 
+    //Toot Visibility
+    toot_visibility_public: "public",
+    toot_visibility_unlisted: "unlisted",
+    toot_visibility_private: "private",
+    toot_visibility_direct: "direct",
+
     //Actions
-    "action_openinbrowser": "Open in Browser",
-    "action_copy": "Copy",
-    "action_mention": "Mention",
-    "action_hide": "Hide",
+    action_openinbrowser: "Open in Browser",
+    action_copy: "Copy",
+    action_mention: "Mention",
+    action_hide: "Hide",
     //Errors
 
     //Global
-    "global_ok" : "OK",
-    "global_cancel": "Cancel",
+    global_ok : "OK",
+    global_cancel: "Cancel",
 }
diff --git a/app/lang/ja-JP.js b/app/lang/ja-JP.js
@@ -20,14 +20,20 @@ export default {
     toot_placeholder: "今何してる？",
     toot_cw_placeholder: "ここに警告を書いてください",
 
+    //トゥート公開範囲
+    toot_visibility_public: "公開",
+    toot_visibility_unlisted: "未収載",
+    toot_visibility_private: "フォロワーのみ",
+    toot_visibility_direct: "ダイレクト",
+
     //Actions
-    "action_openinbrowser": "ブラウザで開く",
-    "action_copy": "コピー",
-    "action_mention": "返信",
-    "action_hide": "隠す",
+    action_openinbrowser: "ブラウザで開く",
+    action_copy: "コピー",
+    action_mention: "返信",
+    action_hide: "隠す",
     //Errors
 
     //Global
-    "global_ok" : "OK",
-    "global_cancel": "キャンセル",
+    global_ok : "OK",
+    global_cancel: "キャンセル",
 }