cleaning up UI

This commit is contained in:
2025-04-15 12:36:18 -04:00
parent 89cda0d210
commit 2e4d02b503
11 changed files with 495 additions and 94 deletions

View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<!-- Background circle -->
<path
android:fillColor="#4285F4"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2z"/>
<!-- Cloud with upload arrow -->
<path
android:fillColor="#FFFFFF"
android:pathData="M16.5,10h-1.5v-1.5c0,-1.66 -1.34,-3 -3,-3s-3,1.34 -3,3v1.5h-1.5c-0.83,0 -1.5,0.67 -1.5,1.5v5c0,0.83 0.67,1.5 1.5,1.5h9c0.83,0 1.5,-0.67 1.5,-1.5v-5c0,-0.83 -0.67,-1.5 -1.5,-1.5zM12,17c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1s1,0.45 1,1s-0.45,1 -1,1zM14,11h-4v-2.5c0,-1.1 0.9,-2 2,-2s2,0.9 2,2v2.5z"/>
<!-- Upload arrow -->
<path
android:fillColor="#FFFFFF"
android:pathData="M12,14L12,14c-0.3,0 -0.5,-0.2 -0.5,-0.5v-3c0,-0.3 0.2,-0.5 0.5,-0.5l0,0c0.3,0 0.5,0.2 0.5,0.5v3c0,0.3 -0.2,0.5 -0.5,0.5z"/>
<path
android:fillColor="#FFFFFF"
android:pathData="M13.5,12.5l-1.5,-1.5l-1.5,1.5"/>
</vector>

View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<!-- Simple upload icon (outline only for notification icons) -->
<path
android:fillColor="#FFFFFF"
android:pathData="M9,16h6v-6h4l-7,-7l-7,7h4V16zM5,18h14v2H5V18z"/>
</vector>

View File

@@ -1,25 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="100dp"
android:height="100dp"
android:viewportWidth="100"
android:viewportHeight="100">
<path
android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
android:strokeWidth="5"
android:fillColor="#f0f0f0"
android:strokeColor="#bbb"/>
<path
android:pathData="M30,30h40v50h-40z"
android:strokeWidth="2"
android:fillColor="#ffffff"
android:strokeColor="#333"/>
<path
android:pathData="M30,30l15,0l0,15l-15,0z"
android:fillColor="#bbb"/>
<path
android:pathData="M50,40l-10,10l5,0l0,10l10,0l0,-10l5,0z"
android:fillColor="#4a90e2"/>
<path
android:pathData="M45,60h10v15h-10z"
android:fillColor="#4a90e2"/>
<!-- Background circle -->
<path
android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
android:fillColor="#4285F4"/>
<!-- File with upload arrow -->
<path
android:pathData="M32,30L54,30L68,44L68,70L32,70Z"
android:fillColor="#FFFFFF"/>
<!-- Folded corner -->
<path
android:pathData="M54,30L54,44L68,44Z"
android:fillColor="#E1E1E1"/>
<!-- Upload arrow -->
<path
android:pathData="M50,50m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0"
android:fillColor="#34A853"/>
<path
android:pathData="M50,44L50,56"
android:strokeWidth="3"
android:strokeColor="#FFFFFF"/>
<path
android:pathData="M45,49L50,44L55,49"
android:strokeWidth="3"
android:strokeColor="#FFFFFF"/>
</vector>

View File

@@ -5,35 +5,143 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<TextView
android:id="@+id/resultView"
android:id="@+id/headerText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Looking for dumpstate..."
android:textSize="18sp"
android:text="@string/app_header"
android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"/>
<Button
android:id="@+id/uploadButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Upload Dumpstate"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/resultView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="16dp"/>
<!-- Main Upload Options Section -->
<androidx.cardview.widget.CardView
android:id="@+id/uploadOptionsCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
app:cardCornerRadius="8dp"
app:cardElevation="4dp"
app:layout_constraintTop_toBottomOf="@id/headerText">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/upload_options_title"
android:textSize="18sp"
android:textStyle="bold"/>
<Button
android:id="@+id/selectFileButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/select_file_button"
android:drawableStart="@android:drawable/ic_menu_search"
android:paddingStart="16dp"
android:paddingEnd="16dp"/>
<Button
android:id="@+id/uploadDumpstateButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/upload_dumpstate_button"
android:drawableStart="@android:drawable/ic_menu_save"
android:paddingStart="16dp"
android:paddingEnd="16dp"/>
</LinearLayout>
</androidx.cardview.widget.CardView>
<!-- Dumpstate Section -->
<androidx.cardview.widget.CardView
android:id="@+id/dumpstateCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
app:cardCornerRadius="8dp"
app:cardElevation="4dp"
app:layout_constraintTop_toBottomOf="@id/uploadOptionsCard">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/dumpstate_section_title"
android:textSize="18sp"
android:textStyle="bold"/>
<TextView
android:id="@+id/dumpstateStatusText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/looking_for_dumpstate"
android:textSize="16sp"/>
</LinearLayout>
</androidx.cardview.widget.CardView>
<!-- Selected File Section -->
<androidx.cardview.widget.CardView
android:id="@+id/selectedFileCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
app:cardCornerRadius="8dp"
app:cardElevation="4dp"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/dumpstateCard">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/selected_file_section_title"
android:textSize="18sp"
android:textStyle="bold"/>
<TextView
android:id="@+id/selectedFileText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/no_file_selected"
android:textSize="16sp"/>
<Button
android:id="@+id/uploadSelectedFileButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/upload_selected_file"
android:visibility="gone"/>
</LinearLayout>
</androidx.cardview.widget.CardView>
<ProgressBar
android:id="@+id/progressBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/uploadButton"
app:layout_constraintTop_toBottomOf="@id/selectedFileCard"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="16dp"/>

View File

@@ -2,12 +2,12 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/action_history"
android:title="Upload History"
android:title="@string/menu_history"
android:orderInCategory="100"
android:showAsAction="never" />
<item
android:id="@+id/action_settings"
android:title="Settings"
android:title="@string/menu_settings"
android:orderInCategory="200"
android:showAsAction="never" />
</menu>

View File

@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">SimpleLogUpload</string>
<string name="title_activity_main">SimpleLogUpload</string>
<!-- Main UI -->
<string name="app_header">Upload Files</string>
<string name="select_file_button">Select File from Storage</string>
<string name="upload_dumpstate_button">Upload Samsung Dumpstate</string>
<string name="upload_selected_file">Upload File</string>
<string name="no_file_selected">No file selected</string>
<string name="looking_for_dumpstate">Looking for dumpstate…</string>
<string name="no_dumpstate_found">No dumpstate file found</string>
<string name="dumpstate_found">Dumpstate found: %1$s</string>
<string name="selected_file">File: %1$s</string>
<string name="uploading_file">Uploading: %1$s</string>
<string name="upload_success">Upload successful! Code: %1$s</string>
<string name="upload_error">Upload error: %1$s</string>
<string name="file_error">Error processing file: %1$s</string>
<!-- Upload options section -->
<string name="upload_options_title">Select Upload Option</string>
<string name="dumpstate_section_title">Dumpstate Detection</string>
<string name="selected_file_section_title">Selected File</string>
<!-- Menu -->
<string name="menu_history">History</string>
<string name="menu_settings">Settings</string>
<!-- Upload Dialog -->
<string name="dialog_upload_success_title">Upload Successful</string>
<string name="dialog_upload_code">Your upload code is:</string>
<string name="dialog_copy_code">Copy Code</string>
<string name="dialog_close">Close</string>
<string name="code_copied">Code copied to clipboard</string>
<!-- Permissions -->
<string name="permission_storage_required">Storage permission is required</string>
<string name="permission_not_granted">Permission not granted!</string>
</resources>