Skip to content

Commit

Permalink
Merge pull request #57 from potproject/development-2.0.0.beta6
Browse files Browse the repository at this point in the history
Development 2.0.0.beta6
  • Loading branch information
potproject authored May 25, 2020
2 parents 95e7ba4 + 83ea867 commit f0dfbf0
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 12 deletions.
2 changes: 1 addition & 1 deletion app.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "ikuradon - Mastodon Client App",
"slug": "potproject-ikuradon",
"sdkVersion": "37.0.0",
"version": "2.0.0.beta5",
"version": "2.0.0.beta6",
"platforms": ["android", "ios"],
"githubUrl": "https://github.com/potproject/ikuradon",
"icon": "assets/image/icon512.png",
Expand Down
12 changes: 11 additions & 1 deletion app/components/MastoRow.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import Action from "./item/Action";
import { ThemeContext } from "react-native-elements";
import MastoRowBody from "./MastoRowBody";
import MastoRowImage from "./MastoRowImage";
import { icon } from "../constants/visibility";

const MastoRow = ({ item, current, actions }) => {
// Toot data
Expand Down Expand Up @@ -51,7 +52,16 @@ const MastoRow = ({ item, current, actions }) => {
</CustomEmoji>
</View>
, [rebloggedName])}
<View style={styles.date}><Text style={{fontSize:12, color: theme.colors.grey2, textAlign: "right" }}>{dateFormat(created_at)}</Text></View>
<View style={styles.date}>
<Text style={{fontSize:12, color: theme.colors.grey2, textAlign: "right" }}>
{sensitive &&
<FontAwesome name={"exclamation"} size={12} color={theme.colors.grey0} style={{marginRight:5}}/>
}
{" "}
<FontAwesome name={icon[visibility]} size={12} color={theme.colors.grey0} style={{marginRight:5}}/>
{" " +dateFormat(created_at)}
</Text>
</View>
<View style={styles.innerContainer}>
<View style={styles.photoContainer}>
{ useMemo(() =>
Expand Down
6 changes: 2 additions & 4 deletions app/components/item/Boost.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function Boost(props){
}}>
<FontAwesome name={disabled ? "lock" : "retweet"} size={20} color={stateReblogged === true ? theme.customColors.item.boost : theme.customColors.item.none} />
</TouchableOpacity>
<Text style={styles.text}>{count !== 0 ? count : ""}</Text>
<Text style={[{color: theme.colors.grey0, fontSize: count > 99 ? 10 : 16},styles.text]}>{count !== 0 ? count : ""}</Text>
</View>
);
}
Expand All @@ -38,9 +38,7 @@ const styles = StyleSheet.create({
flexDirection: "row"
},
text: {
flex: 1,
fontSize: 16,
color: "gray"
flex: 1
}
});

Expand Down
6 changes: 2 additions & 4 deletions app/components/item/Favourite.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function Favourite({id, tootid, style, favourited, count, onFavourite}){
}}>
<FontAwesome name="star" size={20} color={stateFavourited ? theme.customColors.item.favourite : theme.customColors.item.none} />
</TouchableOpacity>
<Text style={styles.text}>{count !== 0 ? count : ""}</Text>
<Text style={[{color: theme.colors.grey0, fontSize: count > 99 ? 10 : 16},styles.text]}>{count !== 0 ? count : ""}</Text>
</View>
);
}
Expand All @@ -36,9 +36,7 @@ const styles = StyleSheet.create({
flexDirection: "row"
},
text: {
flex: 1,
fontSize: 16,
color: "gray"
flex: 1
}
});

Expand Down
6 changes: 6 additions & 0 deletions app/constants/visibility.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export const icon = {
public: "globe",
unlisted: "unlock",
private: "lock",
direct: "envelope",
}
4 changes: 2 additions & 2 deletions app/services/Networking.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ export default class Networking {
return new Promise(async (resolve, reject) => {
try {
let baseurl = "https://" + domain + "";
api.url = restParams !== null ? api.url.replace(":param:", restParams) : api.url;
let url = restParams !== null ? api.url.replace(":param:", restParams) : api.url;
let response = await axios({
url: baseurl + api.url,
url: baseurl + url,
method: api.method,
headers: this.createHeaders(access_token),
params: Object.assign(api.form, postParams)
Expand Down
1 change: 1 addition & 0 deletions app/services/Stream.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export default class Stream {
break;
case "local":
stream = "public:local";
break;
case "home":
default:
stream = "user";
Expand Down

0 comments on commit f0dfbf0

Please sign in to comment.