@dhiraj0720/report1chart 2.7.7 → 2.7.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhiraj0720/report1chart",
-  "version": "2.7.7",
+  "version": "2.7.9",
   "main": "src/index.jsx",
   "scripts": {
     "test": "echo 'No tests'"

package/src/components/SvgBarLineChartCompact3A.jsx

@@ -8,7 +8,7 @@ const SvgBarLineChartCompact3A = ({ data }) => {
   if (!data?.series || !data.labels?.length) return null;
 
   const height = 280;
-  const paddingLeft = 80;
+  const paddingLeft = 20;
   const paddingRight = 30;
   const paddingTop = 30;
   const paddingBottom = 70;
@@ -72,7 +72,7 @@ const SvgBarLineChartCompact3A = ({ data }) => {
                       y={textY}
                       fontSize="10"
                       textAnchor="middle"
-                      fill="black"
+                      fill="white"
                       transform={`rotate(-90 ${textX} ${textY})`}
                       fontWeight="700"
                     >
@@ -88,8 +88,8 @@ const SvgBarLineChartCompact3A = ({ data }) => {
                       y={y(val2025) + h2025 / 2 + 5}
                       fontSize="10"
                       textAnchor="middle"
-                      fill="red"
-                      transform="rotate(-90 40 160)"
+                      fill="white"
+                      transform={`rotate(-90 ${centerX + barGap / 2 + barWidth / 2} ${y(val2025) + h2025 / 2 + 5})`}
                       fontWeight="700"
                     >
                       {formatNumber(val2025)}

package/src/screens/Report1Screen.jsx

@@ -1,5 +1,12 @@
 import React, { useEffect, useState } from 'react';
-import { ScrollView, Text, ActivityIndicator } from 'react-native';
+import {
+  ScrollView,
+  Text,
+  TouchableOpacity,
+  View,
+  ActivityIndicator,
+  StyleSheet,
+} from 'react-native';
 import fetchReport1 from '../api/report1Fetcher';
 import Report1Card from '../components/Report1Card';
 
@@ -8,23 +15,71 @@ const Report1Screen = ({ endpoint, token, onBack }) => {
 
   useEffect(() => {
     fetchReport1(endpoint, token).then(setRows);
-  }, []);
+  }, [endpoint, token]);
 
-  if (!rows) return <ActivityIndicator />;
+  if (!rows) {
+    return (
+      <View style={styles.loadingContainer}>
+        <ActivityIndicator size="large" color="#000" />
+      </View>
+    );
+  }
 
   return (
+    <View style={styles.container}>
+      {/* HEADER WITH BACK ICON */}
+      <View style={styles.header}>
+        <TouchableOpacity onPress={onBack}>
+          <Text style={styles.backIcon}>←</Text>
+        </TouchableOpacity>
+        <Text style={styles.headerTitle}>PERFORMANS RAPORU (USD)</Text>
+      </View>
 
-    <ScrollView style={{ padding: 16 }}>
-      <Text onPress={onBack} style={{ marginBottom: 12 }}>‹ Back</Text>
-      <Text style={{ fontSize: 18, fontWeight: '700', marginBottom: 12 }}>
-        PERFORMANS RAPORU (USD)
-      </Text>
-
-      {rows.map((r, i) => (
-        <Report1Card key={i} item={r} />
-      ))}
-    </ScrollView>
+      <ScrollView style={styles.content}>
+        {rows.map((r, i) => (
+          <Report1Card key={i} item={r} />
+        ))}
+      </ScrollView>
+    </View>
   );
 };
 
-export default Report1Screen;
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: '#f8f9fa',
+  },
+  loadingContainer: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: '#f8f9fa',
+  },
+  header: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    paddingHorizontal: 16,
+    paddingVertical: 18,
+    backgroundColor: '#fff',
+    borderBottomWidth: 1,
+    borderColor: '#eee',
+  },
+  backIcon: {
+    fontSize: 28,
+    color: '#000',
+    fontWeight: '300',
+  },
+  headerTitle: {
+    fontSize: 19,
+    fontWeight: '700',
+    color: '#000',
+    flex: 1,
+    textAlign: 'center',
+  },
+  content: {
+    flex: 1,
+    padding: 16,
+  },
+});
+
+export default Report1Screen;

package/src/screens/ReportListScreen.jsx

@@ -8,35 +8,38 @@ import {
 } from 'react-native';
 
 const REPORTS = [
-  {
-    id: 1,
-    title: 'Report 1',
-    desc: 'Performans Raporu (USD)',
-  },
+  
   {
     id: '1A',
-    title: 'Report 1 A',
-    desc: 'Tablo Bazlı Performans (Detaylı)',
+    title: 'Performans Raporu (USD)',
+    desc: 'Option 1',
   },
   {
-    id: 2,
-    title: 'Report 2',
-    desc: 'Gross Profit by Company & Division',
+    id: 1,
+    title: 'Performans Raporu (USD)',
+    desc: 'Option 2',
   },
+  
   {
     id: '2A',
-    title: 'Report 2 A',
-    desc: 'Compact / Alternate View',
+    title: 'Gross Profit by Company & Division',
+    desc: 'Option 1',
   },
   {
-    id: 3,
-    title: 'Report 3',
-    desc: 'Transportation Business Analysis',
+    id: 2,
+    title: 'Gross Profit by Company & Division',
+    desc: 'Option 2',
   },
+ 
   {
     id: '3A',
-    title: 'Report 3 A',
-    desc: 'Monthly & Budget Comparison',
+    title: 'Transportation Business Analysis',
+    desc: 'Option 1',
+  },
+   {
+    id: 3,
+    title: 'Transportation Business Analysis',
+    desc: 'Option 2',
   },
 ];