Browse Source

Remove offline screen - add app icons

master
Pierre Bresson 3 years ago
parent
commit
c677d886ab
  1. 16
      app/components/listItem/podcastItem.js
  2. 2
      app/config/strings.js
  3. 74
      app/index.js
  4. 16
      ios/thinkerview/Base.lproj/LaunchScreen.xib
  5. BIN
      ios/thinkerview/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
  6. BIN
      ios/thinkerview/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
  7. BIN
      ios/thinkerview/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
  8. BIN
      ios/thinkerview/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
  9. BIN
      ios/thinkerview/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
  10. BIN
      ios/thinkerview/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
  11. BIN
      ios/thinkerview/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
  12. BIN
      ios/thinkerview/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
  13. BIN
      ios/thinkerview/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png
  14. BIN
      logo/logo.png
  15. BIN
      logo/logo_white_bg.png
  16. BIN
      logo/transparent.png
  17. 4
      package.json
  18. 16
      yarn.lock

16
app/components/listItem/podcastItem.js

@ -56,14 +56,14 @@ class PodcastItem extends React.Component {
};
listenPodcast = async () => {
let { item } = this.props;
let { title, audio_link, categories } = item;
const img_url = this.getImage(categories);
let { title, audio_link, categories } = this.props.item;
const img_url = this.getImage(categories).replace(" ", "%20");
const clean_audio_link = audio_link.replace(/ /g, "%20");
TrackPlayer.reset();
await TrackPlayer.add({
id: audio_link,
url: audio_link,
id: clean_audio_link,
url: clean_audio_link,
title: title,
artist: "Cause Commune",
album: "Podcast",
@ -72,7 +72,7 @@ class PodcastItem extends React.Component {
await TrackPlayer.play();
let info = {
title: title,
url: audio_link,
url: clean_audio_link,
artwork: img_url
};
this.props.updateTrackInfo(info);
@ -111,13 +111,13 @@ class PodcastItem extends React.Component {
source={{ uri: img_url }}
/>
<View style={styles.textView}>
<Text numberOfLines={3} style={styles.text}>
<Text numberOfLines={5} style={styles.text}>
{_.capitalize(title)}
</Text>
<View style={styles.categoriesView}>
{/* {this.renderCategories(categories)} */}
{this.renderListen()}
{this.renderSave()}
{/* {this.renderSave()} */}
</View>
</View>
</View>

2
app/config/strings.js

@ -19,7 +19,7 @@ const strings = {
aboutScreen: {
about: "À propos",
aboutAuthor:
"Cette application a été conçu par Pierre Bresson, bénévolement. N'hésitez pas à me faire parvenir vos bugs et la procédure pour les reproduire, de façon civilisée. Si l'application n'arrive pas à charger les interviews, c'est peut-être que le site de Cause Commune ne marche et dans ce cas je ne peux malheureusement rien faire.",
"Cette application a été conçu par Pierre Bresson, bénévolement. N'hésitez pas à me faire parvenir vos bugs et la procédure pour les reproduire, de façon civilisée.",
cause_commune: "Cause Commune - 93.1 FM",
cause_commune_description:
"Cause Commune rassemble dans sa grille de programmes les voix pour l’instant disparates des chercheurs et des inventeurs de solutions propres à relever les défis écologiques, techniques, sociaux et économiques du monde d’aujourd’hui. Pour ce faire, sont notamment invités à la rejoindre tous les acteurs du logiciel libre et du numérique, de la culture libre, de la science et de l’éducation, de l’environnement et de la nature qui oeuvrent pour le maintien et la sauvegarde des Biens Communs et pour une société de la Connaissance fondée sur le partage.",

74
app/index.js

@ -102,43 +102,43 @@ const TabScreens = createBottomTabNavigator(
)
}
},
Offline: {
screen: createStackNavigator(
{
Offline: {
screen: OfflineScreen
},
OfflinePodcast: {
screen: OfflinePodcastScreen
}
},
{
headerMode: "none",
header: null,
navigationOptions: {
header: null
}
}
),
navigationOptions: {
tabBarIcon: ({ tintColor, focused }) =>
focused ? (
<IconEntypo
name={"download"}
size={28}
color={config.colors.thinkerGreen}
style={styles.icon}
/>
) : (
<IconEntypo
name={"download"}
size={28}
color={config.colors.blackTorn}
style={styles.icon}
/>
)
}
},
// Offline: {
// screen: createStackNavigator(
// {
// Offline: {
// screen: OfflineScreen
// },
// OfflinePodcast: {
// screen: OfflinePodcastScreen
// }
// },
// {
// headerMode: "none",
// header: null,
// navigationOptions: {
// header: null
// }
// }
// ),
// navigationOptions: {
// tabBarIcon: ({ tintColor, focused }) =>
// focused ? (
// <IconEntypo
// name={"download"}
// size={28}
// color={config.colors.thinkerGreen}
// style={styles.icon}
// />
// ) : (
// <IconEntypo
// name={"download"}
// size={28}
// color={config.colors.blackTorn}
// style={styles.icon}
// />
// )
// }
// },
About: {
screen: AboutScreen,
navigationOptions: {

16
ios/thinkerview/Base.lproj/LaunchScreen.xib

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@ -16,8 +15,15 @@
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Thinkerview" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<rect key="frame" x="20" y="140" width="441" height="43"/>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cause Commune" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<rect key="frame" x="20" y="139.5" width="440" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="93.1" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GWi-Ac-Cjm">
<rect key="frame" x="20" y="219" width="440" height="43"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>

BIN
ios/thinkerview/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
ios/thinkerview/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
ios/thinkerview/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
ios/thinkerview/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
ios/thinkerview/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
ios/thinkerview/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
ios/thinkerview/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
ios/thinkerview/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
ios/thinkerview/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 KiB

After

Width:  |  Height:  |  Size: 170 KiB

BIN
logo/logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 160 KiB

BIN
logo/logo_white_bg.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 171 KiB

BIN
logo/transparent.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 71 KiB

4
package.json

@ -12,8 +12,8 @@
"lodash": "4.17.11",
"ramda": "0.26.1",
"react": "16.6.3",
"react-native": "0.59.2",
"react-native-background-downloader": "2.0.0",
"react-native": "0.59.3",
"react-native-background-downloader": "2.0.1",
"react-native-check-app-install": "0.0.4",
"react-native-fs": "2.13.3",
"react-native-share": "1.0.23",

16
yarn.lock

@ -5342,10 +5342,10 @@ react-lifecycles-compat@^3, react-lifecycles-compat@^3.0.4:
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
react-native-background-downloader@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/react-native-background-downloader/-/react-native-background-downloader-2.0.0.tgz#a3b3c480921a22279874911f180a7398949decb7"
integrity sha512-eTbXo/tyj3a4SvN1Q3Peu9dAO960YR+uCmfX6NQHE/V0zuKwru/S+zu+zz0W7rg57Lut6VVzkMozXDQMmG02WQ==
react-native-background-downloader@2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/react-native-background-downloader/-/react-native-background-downloader-2.0.1.tgz#14446436f27634d326e89a0c06f9e7652364e614"
integrity sha512-Svo/AqbPsuRNFTGud2aH6SvKbzLpJnpoHiQ0u2k9raVBVnH5KrvqzwP0eoloyzBfE03R4uaUam0kORxLQvoAWg==
react-native-check-app-install@0.0.4:
version "0.0.4"
@ -5440,10 +5440,10 @@ react-native-youtube@1.1.0:
dependencies:
prop-types "^15.5.0"
react-native@0.59.2:
version "0.59.2"
resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.59.2.tgz#c2e2d9e185b04e54948f170841d97c24661a0fa9"
integrity sha512-gIygrCr42rGEQnfjcAZdCOqgjC0oZtTIp+mdbUW+yqHpNUU1PbYKzUkLlvSFGeN+IUcL8WTaC1JtJvghKhaLmA==
react-native@0.59.3:
version "0.59.3"
resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.59.3.tgz#b984bbe457f63d5515046d32ea5721fd22843548"
integrity sha512-dv3AA2rH0L0IccxRkIs4YsriaECy9ttTXrwrgwETXqmE45uVrBFRGePUFnqjcikYkkm6sS0FRxcva088un76JA==
dependencies:
"@babel/runtime" "^7.0.0"
"@react-native-community/cli" "^1.2.1"

Loading…
Cancel
Save