Remove logo bar

app/build.gradle.kts

@@ -19,8 +19,8 @@ android {
         applicationId = "org.mozilla.tiktokreporter"
         minSdk = 26
         targetSdk = 34
-        versionCode = 2
-        versionName = "0.0.2"
+        versionCode = 3
+        versionName = "0.0.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/src/main/java/org/mozilla/tiktokreporter/apppolicy/AppPolicyScreen.kt

@@ -141,19 +141,7 @@ private fun AppPolicyScreenContent(
         }
     }
 
-    MozillaScaffold(modifier = modifier, topBar = if (isForOnboarding) null else {
-        {
-            MozillaTopAppBar(modifier = Modifier.fillMaxWidth(), navItem = {
-                IconButton(
-                    onClick = onNavigateBack
-                ) {
-                    Icon(
-                        imageVector = Icons.Default.ArrowBack, contentDescription = "", tint = MozillaColor.TextColor
-                    )
-                }
-            })
-        }
-    }) { innerPadding ->
+    MozillaScaffold(modifier = modifier) { innerPadding ->
 
         Column(
             modifier = Modifier

app/src/main/java/org/mozilla/tiktokreporter/ui/components/AppScaffold.kt

@@ -13,15 +13,21 @@ fun MozillaScaffold(
     topBar: (@Composable () -> Unit)? = null,
     content: @Composable (PaddingValues) -> Unit,
 ) {
-    Scaffold(
-        modifier = modifier,
-        topBar = topBar ?: {
-            MozillaTopAppBar(
-                modifier = Modifier.fillMaxWidth()
-            )
-        },
-        containerColor = MozillaColor.Background,
-        contentColor = MozillaColor.TextColor,
-        content = content
-    )
+    if (topBar != null) {
+        Scaffold(
+            modifier = modifier,
+            topBar = topBar,
+            containerColor = MozillaColor.Background,
+            contentColor = MozillaColor.TextColor,
+            content = content
+        )
+    } else {
+        Scaffold(
+            modifier = modifier,
+            containerColor = MozillaColor.Background,
+            contentColor = MozillaColor.TextColor,
+            content = content
+        )
+    }
+
 }

app/src/main/java/org/mozilla/tiktokreporter/ui/components/MozillaTopAppBar.kt

@@ -1,17 +1,14 @@
 package org.mozilla.tiktokreporter.ui.components
 
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.width
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
-import org.mozilla.tiktokreporter.R
 import org.mozilla.tiktokreporter.ui.theme.MozillaColor
 import org.mozilla.tiktokreporter.ui.theme.TikTokReporterTheme
 
@@ -29,18 +26,12 @@ fun MozillaTopAppBar(
         titleContentColor = MozillaColor.TextColor,
         actionIconContentColor = MozillaColor.TextColor
     )
-    BoxWithConstraints(
+    Box(
         modifier = modifier
     ) {
         TopAppBar(
             title = {
-                Image(
-                    modifier = Modifier.width(maxWidth.div(2)),
-                    painter = painterResource(
-                        id = R.drawable.fyp_reporter_logo_fyp_reporter_primary_outlined_black
-                    ),
-                    contentDescription = null
-                )
+                Text(text="")
             },
             modifier = Modifier.fillMaxWidth(),
             navigationIcon = navItem,