Compare commits

..

5 Commits
v1.2 ... master

Author SHA1 Message Date
urko 250bc3bb48 fix: permissions 2025-02-18 20:38:50 +01:00
urko f9a76afaa7 feat: use dark theme 2025-02-18 19:15:11 +01:00
urko f70e9b79f0 chore: update gradle jetbrains 2025-02-18 18:40:11 +01:00
urko d21365ba30 refactor: use dark theme with red font colors 2025-02-18 18:39:38 +01:00
urko 1328bb3ac8 chore: upgrade graddle 2025-02-18 18:39:26 +01:00
12 changed files with 51 additions and 16 deletions

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<bytecodeTargetLevel target="17" /> <bytecodeTargetLevel target="21" />
</component> </component>
</project> </project>

View File

@ -4,6 +4,7 @@
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<option name="testRunner" value="CHOOSE_PER_TEST" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" /> <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules"> <option name="modules">

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

View File

@ -27,6 +27,7 @@ android {
getDefaultProguardFile("proguard-android-optimize.txt"), getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro" "proguard-rules.pro"
) )
signingConfig = signingConfigs.getByName("debug")
} }
} }
compileOptions { compileOptions {

View File

@ -6,6 +6,8 @@
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.SYSTEM_CAMERA" tools:ignore="ProtectedPermissions" /> <uses-permission android:name="android.permission.SYSTEM_CAMERA" tools:ignore="ProtectedPermissions" />
<uses-permission android:name="android.permission.SYSTEM_MICROPHONE" tools:ignore="ProtectedPermissions" /> <uses-permission android:name="android.permission.SYSTEM_MICROPHONE" tools:ignore="ProtectedPermissions" />
@ -19,8 +21,8 @@
android:label="@string/app_name" android:label="@string/app_name"
android:roundIcon="@mipmap/wittrail_logo_back" android:roundIcon="@mipmap/wittrail_logo_back"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.WittrailAndroid" android:theme="@style/Theme.WittrailAndroid.Dark"
tools:targetApi="31"> tools:targetApi="31">
<service <service
android:name="CameraXRecordingService" android:name="CameraXRecordingService"
android:foregroundServiceType="camera|microphone" android:foregroundServiceType="camera|microphone"
@ -31,10 +33,9 @@
android:name=".MainActivity" android:name=".MainActivity"
android:exported="true" android:exported="true"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/Theme.WittrailAndroid"> android:theme="@style/Theme.WittrailAndroid.Dark">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>

View File

@ -12,6 +12,7 @@ import android.widget.Toast
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.app.AppCompatDelegate
import androidx.core.app.ActivityCompat import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
@ -37,6 +38,7 @@ class MainActivity : AppCompatActivity() {
@RequiresApi(Build.VERSION_CODES.O) @RequiresApi(Build.VERSION_CODES.O)
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main) setContentView(R.layout.activity_main)

View File

@ -10,20 +10,23 @@
android:id="@+id/startFrontCameraButton" android:id="@+id/startFrontCameraButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Start Front Camera" /> android:textColor="@color/red"
android:text="@string/start_front_camera" />
<Button <Button
android:id="@+id/startBackCameraButton" android:id="@+id/startBackCameraButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Start Back Camera" android:text="@string/start_back_camera"
android:textColor="@color/red"
android:layout_marginTop="16dp" /> android:layout_marginTop="16dp" />
<Button <Button
android:id="@+id/stopCameraButton" android:id="@+id/stopCameraButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Stop Recording" android:text="@string/stolp_recording"
android:textColor="@color/red"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- Original colors -->
<color name="purple_200">#FFBB86FC</color> <color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color> <color name="purple_500">#FF6200EE</color>
<color name="purple_700">#FF3700B3</color> <color name="purple_700">#FF3700B3</color>
@ -7,4 +8,13 @@
<color name="teal_700">#FF018786</color> <color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color> <color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color> <color name="white">#FFFFFFFF</color>
<color name="red">#FF0000</color>
<!-- Dark theme colors -->
<color name="dark_primary">#121212</color>
<color name="dark_primary_variant">#1F1B24</color>
<color name="dark_accent">#BB86FC</color>
<color name="dark_background">#000000</color>
<color name="dark_surface">#121212</color>
<color name="dark_on_primary">#FFFFFF</color>
</resources> </resources>

View File

@ -1,3 +1,6 @@
<resources> <resources>
<string name="app_name">Wittrail</string> <string name="app_name">Wittrail</string>
<string name="start_back_camera">Start Back Camera</string>
<string name="start_front_camera">Start Front Camera</string>
<string name="stolp_recording">Stop Recording</string>
</resources> </resources>

View File

@ -1,9 +1,22 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- Dark theme for your application -->
<!-- Base application theme. --> <style name="Theme.WittrailAndroid.Dark" parent="Theme.AppCompat.DayNight.NoActionBar">
<style name="Theme.WittrailAndroid" parent="Theme.AppCompat.Light.NoActionBar"> <!-- Window background -->
<!-- Customize your theme here. --> <item name="android:windowBackground">@color/dark_background</item>
<item name="android:colorBackground">@color/dark_background</item>
<!-- Primary brand color -->
<item name="colorPrimary">@color/red</item>
<!-- Primary brand color variant -->
<item name="colorPrimaryDark">@color/red</item>
<!-- Accent color -->
<item name="colorAccent">@color/dark_accent</item>
<!-- Surface and onPrimary colors can be used by Material components -->
<item name="android:textColorPrimary">@color/red</item>
</style> </style>
<!-- Base application theme -->
<style name="Theme.WittrailAndroid" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your light theme here -->
</style>
</resources> </resources>

View File

@ -1,5 +1,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins { plugins {
id("com.android.application") version "8.2.2" apply false id("com.android.application") version "8.7.3" apply false
id("org.jetbrains.kotlin.android") version "1.9.0" apply false id("org.jetbrains.kotlin.android") version "1.9.0" apply false
} }

View File

@ -1,6 +1,6 @@
#Sun Jan 28 20:36:02 CET 2024 #Sun Jan 28 20:36:02 CET 2024
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists