Skip to content

Commit

Permalink
Prepare for release
Browse files Browse the repository at this point in the history
  • Loading branch information
farshed committed Apr 21, 2020
1 parent 5cea646 commit ae3b82e
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 42 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -40,6 +40,7 @@ buck-out/
\.buckd/
*.keystore
!debug.keystore
gradle.properties

# fastlane
#
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Expand Up @@ -137,8 +137,8 @@ android {
applicationId "com.vynilla"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
versionCode 4
versionName "3.0.4.20"
multiDexEnabled true
}
splits {
Expand Down
28 changes: 0 additions & 28 deletions android/gradle.properties

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "vynilla",
"version": "0.0.1",
"version": "3.0.0",
"private": true,
"scripts": {
"android": "react-native run-android",
Expand Down
2 changes: 1 addition & 1 deletion src/components/ProgressSlider.js
Expand Up @@ -46,7 +46,7 @@ class ProgressSlider extends ProgressComponent {
value={this.getProgress()}
style={styles.sliderStyle}
minimumTrackTintColor={theme.contrast}
maximumTrackTintColor={`${theme.contrastTrans}0.35)`}
maximumTrackTintColor={`${theme.contrastTrans}0.3)`}
thumbTouchSize={styles.thumbSize}
trackStyle={styles.barStyle}
thumbStyle={styles.thumbStyle}
Expand Down
17 changes: 7 additions & 10 deletions src/components/RenderTrack.js
@@ -1,9 +1,8 @@
import React from 'react';
import { TouchableNativeFeedback as Touchable, Dimensions } from 'react-native';
import styled from 'styled-components/native';
import styled, { withTheme } from 'styled-components/native';
import { connect } from 'react-redux';
import * as actions from '../actions';
// import { CoverImage } from 'react-native-get-music-files-v3dev-test';
import Icon from './Icon';
import { contrastColor, foregroundColor, contrastTransColor } from '../themes/styles';
const placeholder = require('../../assets/placeholder.jpg');
Expand All @@ -12,20 +11,19 @@ const SCREEN_WIDTH = Dimensions.get('window').width;

const RenderTrack = React.memo(
(props) => {
const { item, currentTrack, setCurrentTrack, currentTheme, setOptions } = props;
const { item, currentTrack, setCurrentTrack, setOptions, theme } = props;

function onTrackPress() {
if (item.id !== currentTrack.id) setCurrentTrack(item);
}

const rippleColor =
currentTheme === 'dark' ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)';
const coverSrc = item.artwork ? { uri: item.artwork } : placeholder;
return (
<Touchable onPress={onTrackPress} background={Touchable.Ripple(rippleColor, false)}>
<Touchable
onPress={onTrackPress}
background={Touchable.Ripple(`${theme.contrastTrans}0.1)`, false)}>
<MainWrapper>
<Thumbnail source={coverSrc} />
{/* <CoverImage source={item.url} width={50} height={50} /> */}
<TextWrapper>
<Title numberOfLines={1} current={item.id === currentTrack.id}>
{item.title}
Expand All @@ -48,12 +46,11 @@ const RenderTrack = React.memo(

function mapStateToProps(state) {
return {
currentTrack: state.playback.currentTrack,
currentTheme: state.settings.theme
currentTrack: state.playback.currentTrack
};
}

export default connect(mapStateToProps, actions)(RenderTrack);
export default connect(mapStateToProps, actions)(withTheme(RenderTrack));

const MainWrapper = styled.View`
flex-direction: row;
Expand Down

0 comments on commit ae3b82e

Please sign in to comment.