From 41d78f0d2f98226b58f74bac05ffd6600f9548db Mon Sep 17 00:00:00 2001
From: austinried <4966622+austinried@users.noreply.github.com>
Date: Tue, 22 Jun 2021 10:49:58 +0900
Subject: [PATCH] reworked placeholder

also fixed downloads finishing early and reading corrupted files
---
 App.tsx                                       |  3 +
 .../main/java/com/subsonify/MainActivity.java |  6 ++
 src/components/common/BottomTabBar.tsx        |  2 +-
 src/components/library/AlbumsTab.tsx          | 84 +++++++++++++------
 src/styles/text.ts                            | 18 +++-
 src/subsonic/api.ts                           | 47 +++++++++--
 6 files changed, 127 insertions(+), 33 deletions(-)

diff --git a/App.tsx b/App.tsx
index 8322053..06537cd 100644
--- a/App.tsx
+++ b/App.tsx
@@ -4,6 +4,9 @@ import { RecoilRoot } from 'recoil';
 import SplashPage from './src/components/SplashPage';
 import RootNavigator from './src/components/navigation/RootNavigator';
 
+import { enableScreens } from 'react-native-screens';
+enableScreens();
+
 const App = () => (
   <RecoilRoot>
     <SplashPage>
diff --git a/android/app/src/main/java/com/subsonify/MainActivity.java b/android/app/src/main/java/com/subsonify/MainActivity.java
index 572ac48..4c1957a 100644
--- a/android/app/src/main/java/com/subsonify/MainActivity.java
+++ b/android/app/src/main/java/com/subsonify/MainActivity.java
@@ -1,6 +1,7 @@
 package com.subsonify;
 
 import com.facebook.react.ReactActivity;
+import android.os.Bundle;
 
 public class MainActivity extends ReactActivity {
 
@@ -12,4 +13,9 @@ public class MainActivity extends ReactActivity {
   protected String getMainComponentName() {
     return "SubSonify";
   }
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+      super.onCreate(null);
+  }
 }
diff --git a/src/components/common/BottomTabBar.tsx b/src/components/common/BottomTabBar.tsx
index 417e526..2d47dd9 100644
--- a/src/components/common/BottomTabBar.tsx
+++ b/src/components/common/BottomTabBar.tsx
@@ -75,7 +75,7 @@ const BottomTabBar: React.FC<BottomTabBarProps> = ({ state, descriptors, navigat
               }}
             />
             <Text style={{
-              ...textStyles.small,
+              ...textStyles.xsmall,
               color: isFocused ? colors.text.primary : colors.text.secondary,
             }}>
               {label}
diff --git a/src/components/library/AlbumsTab.tsx b/src/components/library/AlbumsTab.tsx
index fa23645..ffb9482 100644
--- a/src/components/library/AlbumsTab.tsx
+++ b/src/components/library/AlbumsTab.tsx
@@ -12,22 +12,42 @@ import LinearGradient from 'react-native-linear-gradient';
 const AlbumArt: React.FC<{ height: number, width: number, id?: string }> = ({ height, width, id }) => {
   const coverArtSource = useCoverArtUri(id);
 
-  return (
+  // useEffect(() => {
+  //   console.log(id);
+  // });
+
+  const Placeholder = (
     <LinearGradient
       colors={[colors.accent, colors.accentLow]}
       style={{
         height, width,
-        backgroundColor: 'white',
       }}
     >
       <Image
-        source={coverArtSource ? { uri: coverArtSource } : require('../../../res/record-m.png')}
+        source={require('../../../res/record-m.png')}
         style={{
           height, width,
+          resizeMode: 'contain',
         }}
       />
     </LinearGradient>
-  )
+  );
+
+  const CoverArt = (
+    <View style={{
+      height, width,
+    }}>
+      <Image
+        source={{ uri: coverArtSource }}
+        style={{
+          height, width,
+          resizeMode: 'contain',
+        }}
+      />
+    </View>
+  );
+
+  return coverArtSource ? CoverArt : Placeholder;
 }
 
 const AlbumItem: React.FC<{ id: string } > = ({ id }) => {
@@ -37,23 +57,46 @@ const AlbumItem: React.FC<{ id: string } > = ({ id }) => {
   //   console.log(album.name);
   // });
 
+  const size = 180;
+
   return (
     <View style={{
-      flexDirection: 'row',
+      // flexDirection: 'row',
       alignItems: 'center',
-      marginVertical: 6,
-      marginLeft: 6,
-      // height: 200,
+      marginVertical: 10,
+      // marginLeft: 6,
+      // width: size,
+      flex: 1/2,
     }}>
       <AlbumArt
-        width={56}
-        height={56}
+        width={size}
+        height={size}
         id={album.coverArt}
       />
-      <Text style={{
-        ...textStyles.paragraph,
-        marginLeft: 12,
-      }}>{album.name}</Text>
+      <View style={{
+        flex: 1,
+        width: size,
+        // alignItems: 'baseline',
+      }}>
+        <Text
+          style={{
+            ...textStyles.itemTitle,
+            marginTop: 5,
+          }}
+          numberOfLines={2}
+        >
+          {album.name}
+        </Text>
+        <Text
+          style={{
+            ...textStyles.itemSubtitle,
+            marginTop: 3,
+          }}
+          numberOfLines={1}
+        >
+          {album.name}
+        </Text>
+      </View>
     </View>
   );
 }
@@ -83,26 +126,19 @@ const AlbumsList = () => {
     if (!refreshing && albumIds.length === 0) {
       refresh();
     }
-  })
+  });
 
   return (
     <View style={{ flex: 1 }}>
-      {/* <Button
-        title='Update'
-        onPress={updateAlbums}
-      /> */}
       <FlatList
         data={albumIds}
         renderItem={renderItem}
         keyExtractor={item => item}
         onRefresh={refresh}
         refreshing={refreshing}
+        numColumns={2}
+        removeClippedSubviews={false}
       />
-      {/* <ScrollView>
-        {Object.values(albums).map(item => (
-          <AlbumItem item={item} key={item.id} />
-        ))}
-      </ScrollView> */}
     </View>
   );
 }
diff --git a/src/styles/text.ts b/src/styles/text.ts
index e6e3d01..8abdbb0 100644
--- a/src/styles/text.ts
+++ b/src/styles/text.ts
@@ -12,7 +12,19 @@ const header: TextStyle = {
   fontSize: 18,
 };
 
-const small: TextStyle = {
+const itemTitle: TextStyle = {
+  ...paragraph,
+  fontSize: 14,
+  // fontFamily: 'Ubuntu-Light',
+};
+
+const itemSubtitle: TextStyle = {
+  ...paragraph,
+  fontSize: 12,
+  color: colors.text.secondary,
+};
+
+const xsmall: TextStyle = {
   ...paragraph,
   fontSize: 11,
 };
@@ -20,5 +32,7 @@ const small: TextStyle = {
 export default {
   paragraph,
   header,
-  small,
+  itemTitle,
+  itemSubtitle,
+  xsmall
 };
diff --git a/src/subsonic/api.ts b/src/subsonic/api.ts
index f1eacb5..3a9c4b4 100644
--- a/src/subsonic/api.ts
+++ b/src/subsonic/api.ts
@@ -18,6 +18,38 @@ export class SubsonicApiError extends Error {
   }
 }
 
+type QueuePromise = () => Promise<any>;
+
+class Queue {
+  maxSimultaneously: number;
+
+  private active = 0;
+  private queue: QueuePromise[] = [];
+
+  constructor(maxSimultaneously = 1) {
+    this.maxSimultaneously = maxSimultaneously;
+  }
+
+  async enqueue(func: QueuePromise) {
+    if (++this.active > this.maxSimultaneously) {
+      await new Promise(resolve => this.queue.push(resolve as QueuePromise));
+    }
+
+    try {
+      return await func();
+    } catch (err) {
+      throw err;
+    } finally {
+      this.active--;
+      if (this.queue.length) {
+        (this.queue.shift() as QueuePromise)();
+      }
+    }
+  }
+}
+
+const downloadQueue = new Queue(1);
+
 export class SubsonicApiClient {
   address: string;
   username: string;
@@ -36,7 +68,7 @@ export class SubsonicApiClient {
     this.params.append('c', 'subsonify-cool-unique-app-string')
   }
 
-  private buildUrl(method: string, params?: {[key: string]: any}): string {
+  private buildUrl(method: string, params?: { [key: string]: any }): string {
     let query = this.params.toString();
     if (params) {
       const urlParams = this.obj2Params(params);
@@ -50,16 +82,19 @@ export class SubsonicApiClient {
     return url;
   }
 
-  private async apiDownload(method: string, path: string, params?: {[key: string]: any}): Promise<string> {
-    await RNFS.downloadFile({
+  private async apiDownload(method: string, path: string, params?: { [key: string]: any }): Promise<string> {
+    const download = RNFS.downloadFile({
       fromUrl: this.buildUrl(method, params),
       toFile: path,
     }).promise;
-    
+
+    await downloadQueue.enqueue(() => download);
+    await downloadQueue.enqueue(() => new Promise(resolve => setTimeout(resolve, 100)));
+
     return path;
   }
 
-  private async apiGetXml(method: string, params?: {[key: string]: any}): Promise<Document> {
+  private async apiGetXml(method: string, params?: { [key: string]: any }): Promise<Document> {
     const response = await fetch(this.buildUrl(method, params));
     const text = await response.text();
 
@@ -73,7 +108,7 @@ export class SubsonicApiClient {
     return xml;
   }
 
-  private obj2Params(obj: {[key: string]: any}): URLSearchParams | undefined {
+  private obj2Params(obj: { [key: string]: any }): URLSearchParams | undefined {
     const keys = Object.keys(obj);
     if (keys.length === 0) {
       return undefined;