Skip to content

Commit

Permalink
[1.4.4-beta] Changelog
Browse files Browse the repository at this point in the history 
* stability issue fixes
* bug fixes and optimizations
* ui enhancements
* ui optimizations
  • Loading branch information
wendale.dy committed Jan 16, 2023
1 parent 81d4472 commit 6e6f22d
Show file tree
Hide file tree
Showing 13 changed files with 84 additions and 69 deletions.
2 changes: 1 addition & 1 deletion android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.4.3"
versionName "1.4.4"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()

if (isNewArchitectureEnabled()) {
Expand Down
Empty file modified android/gradlew
100644 → 100755
View file
Empty file.
Binary file added builds/android/1.4.4-beta/app-release.apk
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"react-native-orientation-locker": "^1.5.0",
"react-native-pip-android": "^1.0.1",
"react-native-reanimated": "^2.9.1",
"react-native-reanimated-player": "^2.2.1",
"react-native-reanimated-player": "2.3.0",
"react-native-safe-area-context": "^4.3.1",
"react-native-screens": "^3.15.0",
"react-native-system-setting": "^1.7.6",
Expand Down
2 changes: 1 addition & 1 deletion src/components/CreditsModal/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ const CreditsModal = ({ isOpen, onClose }) => {
color: colors.white,
marginBottom: 20
}}
>1.4.3 beta</Text>
>1.4.4 beta</Text>
<ScrollView>
<Text
style={{
Expand Down
3 changes: 3 additions & 0 deletions src/components/MediaPlayer/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ const MediaPlayer = ({
onPausedChange={state => {
setPaused(state);
}}
onTapMore={() => {
alert("Cumming soon!")
}}
videoHeight={videoHeight}
paused={paused}
autoPlay={true}
Expand Down
35 changes: 23 additions & 12 deletions src/components/TvDetails/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,32 @@ const TvDetails = ({ setSelectedSeason, seasonData, selectedSeason }) => {
</View>
{
seasonData?.length > 0 ?
<Picker
selectedValue={selectedSeason?.id}
<View
style={{
color: colors.white,
borderColor: colors.white,
borderWidth: 1,
borderRadius: 10,
margin: 10,
}}
onValueChange={(itemValue, itemIndex) => {
setSelectedSeason(seasonData.find(season => season.id === itemValue))
}
}>
{seasonData?.map(season => (
<Picker.Item style={{
color: colors.black,
}} key={season.id} label={season.title} value={season.id} />
))}
</Picker>
>
<Picker
themeVariant="dark"
selectedValue={selectedSeason?.id}
style={{
color: colors.white,
}}
onValueChange={(itemValue, itemIndex) => {
setSelectedSeason(seasonData.find(season => season.id === itemValue))
}
}>
{seasonData?.map(season => (
<Picker.Item style={{
color: colors.white,
}} key={season.id} label={season.title} value={season.id} />
))}
</Picker>
</View>
:
<View style={{
padding: 10,
Expand Down
30 changes: 18 additions & 12 deletions src/components/TvEpisodes/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React from 'react'
import { View, TouchableOpacity, Image, Text } from 'react-native';
import { View, TouchableOpacity, Image, Text, ActivityIndicator } from 'react-native';
import tmdb from '~/api/tmdb'
import solarmovie from '../../api/solarmovie';
import { colors } from '~/constants/theme';
import Icon from 'react-native-vector-icons/MaterialCommunityIcons';


const TvEpisodes = ({ episodeData, setSelectedEpisode, selectedEpisode}) => {
const TvEpisodes = ({ episodeData, setSelectedEpisode, selectedEpisode, isLoaded }) => {

return (
<View
Expand All @@ -30,18 +30,19 @@ const TvEpisodes = ({ episodeData, setSelectedEpisode, selectedEpisode}) => {
justifyContent: 'space-between',
padding: 10,
paddingTop: 15,
borderBottomWidth: 1,
borderWidth: 1,
borderRadius: 10,
borderColor: selectedEpisode?.id === episode.id ? colors.white : colors.black,
}}
>
<Image
source={episode?.image ? { uri: episode.image } : require('~/assets/logo/logo.png')}
style={{
width: 100,
height: 100,
borderRadius: 10,
marginHorizontal: 10,
width: 100,
height: 50,
}}
resizeMode="cover"
/>
<View
style={{
Expand Down Expand Up @@ -74,14 +75,19 @@ const TvEpisodes = ({ episodeData, setSelectedEpisode, selectedEpisode}) => {
style={{
alignItems: 'center',
justifyContent: 'center',
height: 100,
height: 50,
}}
>
<Icon
name="play"
size={30}
color={colors.white}
/>
{
!isLoaded ?
<ActivityIndicator size="small" color={colors.red} />
:
<Icon
name="play"
size={30}
color={colors.white}
/>
}
</View>
}
</View>
Expand Down
6 changes: 3 additions & 3 deletions src/redux/profileSlice.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const initialState = {
password: '',
},
open_subtitle_token: '',
player_type: 'youtube',
player_type: 'legacy',
}

export const profileSlice = createSlice({
Expand All @@ -21,7 +21,7 @@ export const profileSlice = createSlice({
reducers: {
getprofileData: (state, action) => {
try{
const userData = JSON.parse(action.payload)
const userData = action.payload
state.myList = userData.myList
state.continueWatching = userData.continueWatching
state.downloads = userData.downloads
Expand All @@ -30,7 +30,7 @@ export const profileSlice = createSlice({
state.open_subtitle_token = userData.open_subtitle_token
state.player_type = userData.player_type
}catch(err){
alert("An error occurred while loading your data")
console.log(err)
}
},
setProvider: (state, action) => {
Expand Down
2 changes: 2 additions & 0 deletions src/screens/Details/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ const Details = ({ navigation, route }) => {

useEffect(() => {
if (movie.type == "tv" && selectedEpisode.id) {
setVideo(null);
switch (provider) {
case "solarmovie":
getEpisodeVideoSolar(selectedEpisode.id);
Expand Down Expand Up @@ -270,6 +271,7 @@ const Details = ({ navigation, route }) => {
setSelectedEpisode={setSelectedEpisode}
selectedEpisode={selectedEpisode}
episodeData={episodeData}
isLoaded={video ? true : false}
/>
</View>
)
Expand Down
41 changes: 21 additions & 20 deletions src/screens/Splash/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import {
} from '~/providers/KrazyDevsScrapper/FMoviesProvider'

////////////////////
import { fromPairs } from 'lodash'
import _, { fromPairs } from 'lodash'

const Splash = ({ navigation }) => {
const loadingMessage = require('~/constants/loadingmessage.js');
Expand All @@ -48,6 +48,14 @@ const Splash = ({ navigation }) => {
provider
} = useSelector(state => state.profile)


const proceedToHome = () => {
navigation.reset({
index: 0,
routes: [{ name: 'Tabs' }]
})
}

const laodDataFlixHQ = async () => {
dispatch(setMovies(await getheroflixhq()));
dispatch(setPopularMovie(await getheroflixhq('movie')));
Expand All @@ -56,7 +64,7 @@ const Splash = ({ navigation }) => {
dispatch(setComedyMovie(await getgenreflixhq('comedy', 'movie')));
dispatch(setRomanceMovie(await getgenreflixhq('romance', 'movie')));
dispatch(setTvShow(await getheroflixhq('tv')));
getData()
proceedToHome();
}

const laodDataSolarMovie = async () => {
Expand All @@ -67,7 +75,7 @@ const Splash = ({ navigation }) => {
dispatch(setComedyMovie(await getgenresolarmovie('comedy', 'movie')));
dispatch(setRomanceMovie(await getgenresolarmovie('romance', 'movie')));
dispatch(setTvShow(await getherosolarmovie('tv')));
getData()
proceedToHome();
}

const laodDataFMovies = async () => {
Expand All @@ -78,24 +86,18 @@ const Splash = ({ navigation }) => {
dispatch(setComedyMovie(await getgenrefmovies('comedy', 'movie')));
dispatch(setRomanceMovie(await getgenrefmovies('romance', 'movie')));
dispatch(setTvShow(await getherofmovies('tv')));
getData()
proceedToHome();
}

const getData = async () => {
const getLocalStorageData = async () => {
try {
const value = await AsyncStorage.getItem('userData')
if (value !== null) {
const value = await AsyncStorage.getItem('userProfile')
console.log(value)
if (value) {
const userData = JSON.parse(value) || []
if (userData.length > 0) {
dispatch(getData(userData))
}
navigation.reset({
index: 0,
routes: [{ name: 'Tabs' }],
})
dispatch(getprofileData(userData))
getMovieData();
} else {
const userData = JSON.parse(value) || []
await AsyncStorage.setItem('userData', JSON.stringify(userData))
navigation.reset({
index: 0,
routes: [{ name: 'StartUp' }]
Expand Down Expand Up @@ -135,9 +137,8 @@ const Splash = ({ navigation }) => {
changeMessage();
}, 3000)
}
const getDatas = async () => {
const getMovieData = async () => {
try{
await dispatch(getprofileData(await AsyncStorage.getItem('userProfile')))
if(provider !== '') {
switch(provider) {
case "flixhq":
Expand Down Expand Up @@ -176,7 +177,7 @@ const Splash = ({ navigation }) => {
default:
break;
}
}
}
} catch (error) {
alert("Error: " + error);
}
Expand All @@ -185,7 +186,7 @@ const Splash = ({ navigation }) => {
useEffect(() => {
changeMessage()
loadPermission()
getDatas()
getLocalStorageData()
}, [])

return (
Expand Down
22 changes: 7 additions & 15 deletions src/screens/StartUp/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@ import AsyncStorage from '@react-native-community/async-storage'

const StartUp = ({ navigation }) => {
const dispatch = useDispatch()
const {
myList,
continueWatching,
downloads,
provider,
open_subtitle,
open_subtitle_token,
player_type
} = useSelector(state => state.profile);
const setDefaultProvider = async () => {
try{
dispatch(setProvider('flixhq'))
Expand All @@ -29,14 +20,15 @@ const StartUp = ({ navigation }) => {
provider: 'flixhq',
open_subtitle: '',
open_subtitle_token: '',
player_type: 'youtube',
})).catch((error) => {
player_type: 'legacy',
})).then(() => {
navigation.reset({
index: 0,
routes: [{ name: 'Splash' }]
})
}).catch((error) => {
alert("An error occurred while saving your data")
});
navigation.reset({
index: 0,
routes: [{ name: 'Tabs' }]
})
} catch (e) {
alert(e)
}
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6214,10 +6214,10 @@ react-native-pip-android@^1.0.1:
resolved "https://registry.yarnpkg.com/react-native-pip-android/-/react-native-pip-android-1.0.1.tgz#541717fae99685ebe1b10a431a1ed0cd5142ee01"
integrity sha512-x6klZyInwovU9SCVUqlkSsAdvjt2IxHbqYy6+Axx0PVYvSK/WolWgvfIp0yFu8H3G2AQgcbDdCo3+AvSq7+YPg==

react-native-reanimated-player@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/react-native-reanimated-player/-/react-native-reanimated-player-2.2.1.tgz#8b9b90b05935ca5a47303f5a2179dd5250e6f87b"
integrity sha512-blSwEu62vDKO37mEziz/E3iyUXOUHYaumME5EwOzmboYtbj6qJZTFATDDevpetnl4lGhFCCetfCFIUOzfmaC2Q==
react-native-reanimated-player@2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/react-native-reanimated-player/-/react-native-reanimated-player-2.3.0.tgz#4749a7552fa4b9c8bb9bc071531161ccfc8cfe05"
integrity sha512-Mo3xJAJr8zg97cAT4/+5bOmocKILHMDZ0xVZ8ndfA6FTt4vXQbBf0itomZi7lzRm73aZEhFaICmyHqb5IgxDnw==
dependencies:
"@gorhom/portal" "^1.0.12"
lodash.padstart "^4.6.1"
Expand Down

0 comments on commit 6e6f22d

Please sign in to comment.