diff --git a/android/FucksGiven/.gitignore b/android/FucksGiven/.gitignore deleted file mode 100644 index aa724b7..0000000 --- a/android/FucksGiven/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -.DS_Store -/build -/captures -.externalNativeBuild -.cxx -local.properties diff --git a/android/FucksGiven/gradlew b/android/FucksGiven/gradlew deleted file mode 100644 index 4f906e0..0000000 --- a/android/FucksGiven/gradlew +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/android/FucksGiven/gradlew.bat b/android/FucksGiven/gradlew.bat deleted file mode 100644 index 107acd3..0000000 --- a/android/FucksGiven/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/android/app-release.aab b/android/app-release.aab deleted file mode 100644 index 57d310e..0000000 Binary files a/android/app-release.aab and /dev/null differ diff --git a/android/FucksGiven/app/.gitignore b/android/app/.gitignore similarity index 100% rename from android/FucksGiven/app/.gitignore rename to android/app/.gitignore diff --git a/android/FucksGiven/app/build.gradle.kts b/android/app/build.gradle.kts similarity index 100% rename from android/FucksGiven/app/build.gradle.kts rename to android/app/build.gradle.kts diff --git a/android/FucksGiven/app/lint.xml b/android/app/lint.xml similarity index 100% rename from android/FucksGiven/app/lint.xml rename to android/app/lint.xml diff --git a/android/FucksGiven/app/proguard-rules.pro b/android/app/proguard-rules.pro similarity index 100% rename from android/FucksGiven/app/proguard-rules.pro rename to android/app/proguard-rules.pro diff --git a/android/FucksGiven/app/release/app-release.aab b/android/app/release/app-release.aab similarity index 100% rename from android/FucksGiven/app/release/app-release.aab rename to android/app/release/app-release.aab diff --git a/android/FucksGiven/app/src/androidTest/java/rocks/poopjournal/fucksgiven/ExampleInstrumentedTest.kt b/android/app/src/androidTest/java/rocks/poopjournal/fucksgiven/ExampleInstrumentedTest.kt similarity index 100% rename from android/FucksGiven/app/src/androidTest/java/rocks/poopjournal/fucksgiven/ExampleInstrumentedTest.kt rename to android/app/src/androidTest/java/rocks/poopjournal/fucksgiven/ExampleInstrumentedTest.kt diff --git a/android/FucksGiven/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml similarity index 100% rename from android/FucksGiven/app/src/main/AndroidManifest.xml rename to android/app/src/main/AndroidManifest.xml diff --git a/android/FucksGiven/app/src/main/ic_launcher-playstore.png b/android/app/src/main/ic_launcher-playstore.png similarity index 100% rename from android/FucksGiven/app/src/main/ic_launcher-playstore.png rename to android/app/src/main/ic_launcher-playstore.png diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/FucksGivenApplication.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/FucksGivenApplication.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/FucksGivenApplication.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/FucksGivenApplication.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/MainActivity.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/MainActivity.kt similarity index 75% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/MainActivity.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/MainActivity.kt index 4b5b0c3..864cc8b 100644 --- a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/MainActivity.kt +++ b/android/app/src/main/java/rocks/poopjournal/fucksgiven/MainActivity.kt @@ -3,6 +3,7 @@ package rocks.poopjournal.fucksgiven import android.app.LocaleConfig import android.app.LocaleManager import android.os.Build +import android.os.Build.VERSION.SDK_INT import android.os.Bundle import android.os.LocaleList import androidx.activity.ComponentActivity @@ -29,15 +30,16 @@ class MainActivity : ComponentActivity() { super.onCreate(savedInstanceState) enableEdgeToEdge() setContent { - val localeManager = applicationContext - .getSystemService(LocaleManager::class.java) - localeManager.overrideLocaleConfig = LocaleConfig( - LocaleList.forLanguageTags("en-US,de,ur,fr") - ) - - val overrideLocaleConfig = localeManager.overrideLocaleConfig - val supportedLocales = overrideLocaleConfig?.supportedLocales + if (SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + val localeManager = applicationContext + .getSystemService(LocaleManager::class.java) + localeManager.overrideLocaleConfig = LocaleConfig( + LocaleList.forLanguageTags("en-US,de,ur,fr") + ) + val overrideLocaleConfig = localeManager.overrideLocaleConfig + val supportedLocales = overrideLocaleConfig?.supportedLocales + } val theme = themeSetting.themeFlow.collectAsState() val useDarkColors = when (theme.value) { AppTheme.LIGHT -> false diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/data/DatabaseBackup.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/data/DatabaseBackup.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/data/DatabaseBackup.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/data/DatabaseBackup.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/data/FuckDao.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/data/FuckDao.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/data/FuckDao.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/data/FuckDao.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/data/FuckData.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/data/FuckData.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/data/FuckData.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/data/FuckData.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/data/FuckDatabase.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/data/FuckDatabase.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/data/FuckDatabase.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/data/FuckDatabase.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/data/FuckRepository.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/data/FuckRepository.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/data/FuckRepository.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/data/FuckRepository.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/data/ThemeRepositoryImpl.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/data/ThemeRepositoryImpl.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/data/ThemeRepositoryImpl.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/data/ThemeRepositoryImpl.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/di/AppModule.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/di/AppModule.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/di/AppModule.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/di/AppModule.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/di/SettingModule.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/di/SettingModule.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/di/SettingModule.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/di/SettingModule.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/BottomBar.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/BottomBar.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/BottomBar.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/BottomBar.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/Chart.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/Chart.kt similarity index 96% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/Chart.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/Chart.kt index 1679fec..a19fb59 100644 --- a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/Chart.kt +++ b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/Chart.kt @@ -71,6 +71,8 @@ fun LineChartComposable( setCircleColor(FuckGreen.toArgb()) setDrawValues(false) setPinchZoom(false) + setScaleMinima(2f, 2f) + } val lineData = LineData(dataSet) @@ -88,6 +90,7 @@ fun LineChartComposable( xAxis.typeface = tf + axisRight.valueFormatter = object : ValueFormatter() { override fun getFormattedValue(value: Float): String { return value.toInt().toString() @@ -142,7 +145,10 @@ fun LineChartComposable( // chart.axisRight.axisMaximum = 10f chart.axisRight.isGranularityEnabled = true chart.notifyDataSetChanged() - + chart.fitScreen() + chart.viewPortHandler.setMaximumScaleX(2f); + chart.viewPortHandler.setMaximumScaleY(2f); + chart.isDoubleTapToZoomEnabled = false chart.invalidate() // Refresh the chart } ) diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/Horizontal Pager.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/Horizontal Pager.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/Horizontal Pager.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/Horizontal Pager.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/ThemeChangeDialog.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/ThemeChangeDialog.kt similarity index 96% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/ThemeChangeDialog.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/ThemeChangeDialog.kt index 5ae03b0..0d6dc00 100644 --- a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/ThemeChangeDialog.kt +++ b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/ThemeChangeDialog.kt @@ -104,8 +104,8 @@ private fun RadioGroupItems( Spacer(modifier = modifier.width(5.dp)) Text( text = items.name, - color = MaterialTheme.colorScheme.onSurface, - style = MaterialTheme.typography.bodySmall + color = MaterialTheme.colorScheme.onBackground, + style = MaterialTheme.typography.bodyLarge ) } } diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/TopAppBar.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/TopAppBar.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/TopAppBar.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/component/TopAppBar.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/navigation/AppRoutes.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/navigation/AppRoutes.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/navigation/AppRoutes.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/navigation/AppRoutes.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/navigation/NavGraph.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/navigation/NavGraph.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/navigation/NavGraph.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/navigation/NavGraph.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/AboutScreen.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/AboutScreen.kt similarity index 98% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/AboutScreen.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/AboutScreen.kt index 0c5c1af..aea65cf 100644 --- a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/AboutScreen.kt +++ b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/AboutScreen.kt @@ -128,12 +128,10 @@ fun AboutScreen(navController: NavHostController) { } ClickableText(text = stylizedPoetry, onClick = {}) Spacer(modifier = Modifier.height(10.dp)) - Column(modifier = Modifier.padding(8.dp)) { + Column(modifier = Modifier.padding(8.dp), horizontalAlignment = Alignment.CenterHorizontally) { MarvinRow(context = context) - Spacer(modifier = Modifier.height(8.dp)) Divider(modifier = Modifier.padding(start = 12.dp)) - MubeenRow(context = context) } Column { @@ -185,7 +183,7 @@ fun MarvinRow(context: Context) { verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween ) { - Row { + Row(verticalAlignment = Alignment.CenterVertically) { Image( painter = painterResource(id = R.drawable.marvin), contentDescription = "crazy marvin", @@ -260,7 +258,7 @@ fun MubeenRow(context: Context) { verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween ) { - Row { + Row(verticalAlignment = Alignment.CenterVertically) { Image( painter = painterResource(id = R.drawable.mubeen), contentDescription = "crazy marvin", @@ -328,7 +326,7 @@ fun MubeenRow(context: Context) { @Composable fun ContributionRow(context: Context) { - Column(modifier = Modifier.padding(8.dp)) { + Column(modifier = Modifier.padding(start = 8.dp, end = 8.dp), horizontalAlignment = Alignment.CenterHorizontally) { Row( modifier = Modifier .fillMaxWidth() @@ -354,7 +352,6 @@ fun ContributionRow(context: Context) { color = MaterialTheme.colorScheme.onBackground ) } - Spacer(modifier = Modifier.height(8.dp)) Divider(modifier = Modifier.padding(start = 8.dp)) Row( modifier = Modifier @@ -381,7 +378,6 @@ fun ContributionRow(context: Context) { color = MaterialTheme.colorScheme.onBackground ) } - Spacer(modifier = Modifier.height(8.dp)) Divider(modifier = Modifier.padding(start = 8.dp)) Row( modifier = Modifier diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/HomeScreen.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/HomeScreen.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/HomeScreen.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/HomeScreen.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/SettingsScreen.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/SettingsScreen.kt similarity index 99% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/SettingsScreen.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/SettingsScreen.kt index 142f49a..a39b2e7 100644 --- a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/SettingsScreen.kt +++ b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/SettingsScreen.kt @@ -216,7 +216,7 @@ fun ThemeSelectionDialog( }, confirmButton = { Button(onClick = onDismissRequest) { - Text(stringResource(id = R.string.ok)) + Text(stringResource(id = R.string.ok), color = Color.White) } } ) diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/StatsScreen.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/StatsScreen.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/StatsScreen.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/StatsScreen.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/theme/Color.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/theme/Color.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/theme/Color.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/theme/Color.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/theme/Theme.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/theme/Theme.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/theme/Theme.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/theme/Theme.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/theme/Type.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/theme/Type.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/theme/Type.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/theme/Type.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/utils/Constants.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/utils/Constants.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/utils/Constants.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/utils/Constants.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/utils/ThemeModes.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/utils/ThemeModes.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/utils/ThemeModes.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/ui/utils/ThemeModes.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/viewmodel/HomeViewModel.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/viewmodel/HomeViewModel.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/viewmodel/HomeViewModel.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/viewmodel/HomeViewModel.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/viewmodel/SettingsViewModel.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/viewmodel/SettingsViewModel.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/viewmodel/SettingsViewModel.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/viewmodel/SettingsViewModel.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/viewmodel/StatsViewModel.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/viewmodel/StatsViewModel.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/viewmodel/StatsViewModel.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/viewmodel/StatsViewModel.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/widget/TaskWidgetProvider.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/widget/TaskWidgetProvider.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/widget/TaskWidgetProvider.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/widget/TaskWidgetProvider.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/widget/TaskWidgetReceiver.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/widget/TaskWidgetReceiver.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/widget/TaskWidgetReceiver.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/widget/TaskWidgetReceiver.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/widget/WidgetTheme.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/widget/WidgetTheme.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/widget/WidgetTheme.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/widget/WidgetTheme.kt diff --git a/android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/widget/WidgetViewModel.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/widget/WidgetViewModel.kt similarity index 100% rename from android/FucksGiven/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/widget/WidgetViewModel.kt rename to android/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/widget/WidgetViewModel.kt diff --git a/android/FucksGiven/app/src/main/res/drawable-nodpi/example_appwidget_preview.png b/android/app/src/main/res/drawable-nodpi/example_appwidget_preview.png similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable-nodpi/example_appwidget_preview.png rename to android/app/src/main/res/drawable-nodpi/example_appwidget_preview.png diff --git a/android/FucksGiven/app/src/main/res/drawable-v21/app_widget_background.xml b/android/app/src/main/res/drawable-v21/app_widget_background.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable-v21/app_widget_background.xml rename to android/app/src/main/res/drawable-v21/app_widget_background.xml diff --git a/android/FucksGiven/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml b/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml rename to android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/about.xml b/android/app/src/main/res/drawable/about.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/about.xml rename to android/app/src/main/res/drawable/about.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/backup.xml b/android/app/src/main/res/drawable/backup.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/backup.xml rename to android/app/src/main/res/drawable/backup.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/baseline_add_24.xml b/android/app/src/main/res/drawable/baseline_add_24.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/baseline_add_24.xml rename to android/app/src/main/res/drawable/baseline_add_24.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/bg_widget.xml b/android/app/src/main/res/drawable/bg_widget.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/bg_widget.xml rename to android/app/src/main/res/drawable/bg_widget.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/btn_background.xml b/android/app/src/main/res/drawable/btn_background.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/btn_background.xml rename to android/app/src/main/res/drawable/btn_background.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/fucks.xml b/android/app/src/main/res/drawable/fucks.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/fucks.xml rename to android/app/src/main/res/drawable/fucks.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/github.xml b/android/app/src/main/res/drawable/github.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/github.xml rename to android/app/src/main/res/drawable/github.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/gmail.xml b/android/app/src/main/res/drawable/gmail.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/gmail.xml rename to android/app/src/main/res/drawable/gmail.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/graph.xml b/android/app/src/main/res/drawable/graph.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/graph.xml rename to android/app/src/main/res/drawable/graph.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/home.xml b/android/app/src/main/res/drawable/home.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/home.xml rename to android/app/src/main/res/drawable/home.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/ic_launcher_background.xml b/android/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/ic_launcher_background.xml rename to android/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/ic_launcher_foreground.xml rename to android/app/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/ic_launcher_monochrome.xml b/android/app/src/main/res/drawable/ic_launcher_monochrome.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/ic_launcher_monochrome.xml rename to android/app/src/main/res/drawable/ic_launcher_monochrome.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/marvin.png b/android/app/src/main/res/drawable/marvin.png similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/marvin.png rename to android/app/src/main/res/drawable/marvin.png diff --git a/android/FucksGiven/app/src/main/res/drawable/message.xml b/android/app/src/main/res/drawable/message.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/message.xml rename to android/app/src/main/res/drawable/message.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/mubeen.jpg b/android/app/src/main/res/drawable/mubeen.jpg similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/mubeen.jpg rename to android/app/src/main/res/drawable/mubeen.jpg diff --git a/android/FucksGiven/app/src/main/res/drawable/report.xml b/android/app/src/main/res/drawable/report.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/report.xml rename to android/app/src/main/res/drawable/report.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/restore.xml b/android/app/src/main/res/drawable/restore.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/restore.xml rename to android/app/src/main/res/drawable/restore.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/selected_graph.xml b/android/app/src/main/res/drawable/selected_graph.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/selected_graph.xml rename to android/app/src/main/res/drawable/selected_graph.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/selected_home.xml b/android/app/src/main/res/drawable/selected_home.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/selected_home.xml rename to android/app/src/main/res/drawable/selected_home.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/settings.xml b/android/app/src/main/res/drawable/settings.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/settings.xml rename to android/app/src/main/res/drawable/settings.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/source.xml b/android/app/src/main/res/drawable/source.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/source.xml rename to android/app/src/main/res/drawable/source.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/splash_icon.xml b/android/app/src/main/res/drawable/splash_icon.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/splash_icon.xml rename to android/app/src/main/res/drawable/splash_icon.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/translate.xml b/android/app/src/main/res/drawable/translate.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/translate.xml rename to android/app/src/main/res/drawable/translate.xml diff --git a/android/FucksGiven/app/src/main/res/drawable/x.xml b/android/app/src/main/res/drawable/x.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/drawable/x.xml rename to android/app/src/main/res/drawable/x.xml diff --git a/android/FucksGiven/app/src/main/res/font/opensans_regular.ttf b/android/app/src/main/res/font/opensans_regular.ttf similarity index 100% rename from android/FucksGiven/app/src/main/res/font/opensans_regular.ttf rename to android/app/src/main/res/font/opensans_regular.ttf diff --git a/android/FucksGiven/app/src/main/res/font/ubuntu_bold.ttf b/android/app/src/main/res/font/ubuntu_bold.ttf similarity index 100% rename from android/FucksGiven/app/src/main/res/font/ubuntu_bold.ttf rename to android/app/src/main/res/font/ubuntu_bold.ttf diff --git a/android/FucksGiven/app/src/main/res/font/ubuntu_italic.ttf b/android/app/src/main/res/font/ubuntu_italic.ttf similarity index 100% rename from android/FucksGiven/app/src/main/res/font/ubuntu_italic.ttf rename to android/app/src/main/res/font/ubuntu_italic.ttf diff --git a/android/FucksGiven/app/src/main/res/font/ubuntu_light.ttf b/android/app/src/main/res/font/ubuntu_light.ttf similarity index 100% rename from android/FucksGiven/app/src/main/res/font/ubuntu_light.ttf rename to android/app/src/main/res/font/ubuntu_light.ttf diff --git a/android/FucksGiven/app/src/main/res/font/ubuntu_medium.ttf b/android/app/src/main/res/font/ubuntu_medium.ttf similarity index 100% rename from android/FucksGiven/app/src/main/res/font/ubuntu_medium.ttf rename to android/app/src/main/res/font/ubuntu_medium.ttf diff --git a/android/FucksGiven/app/src/main/res/font/ubuntu_regular.ttf b/android/app/src/main/res/font/ubuntu_regular.ttf similarity index 100% rename from android/FucksGiven/app/src/main/res/font/ubuntu_regular.ttf rename to android/app/src/main/res/font/ubuntu_regular.ttf diff --git a/android/FucksGiven/app/src/main/res/layout/widget_initial_layout.xml b/android/app/src/main/res/layout/widget_initial_layout.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/layout/widget_initial_layout.xml rename to android/app/src/main/res/layout/widget_initial_layout.xml diff --git a/android/FucksGiven/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/android/FucksGiven/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/android/FucksGiven/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to android/app/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/android/FucksGiven/app/src/main/res/mipmap-hdpi/ic_launcher_background.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-hdpi/ic_launcher_background.webp rename to android/app/src/main/res/mipmap-hdpi/ic_launcher_background.webp diff --git a/android/FucksGiven/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp rename to android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp diff --git a/android/FucksGiven/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/android/FucksGiven/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to android/app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/android/FucksGiven/app/src/main/res/mipmap-mdpi/ic_launcher_background.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-mdpi/ic_launcher_background.webp rename to android/app/src/main/res/mipmap-mdpi/ic_launcher_background.webp diff --git a/android/FucksGiven/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp rename to android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp diff --git a/android/FucksGiven/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/android/FucksGiven/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/android/FucksGiven/app/src/main/res/mipmap-xhdpi/ic_launcher_background.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-xhdpi/ic_launcher_background.webp rename to android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.webp diff --git a/android/FucksGiven/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp rename to android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp diff --git a/android/FucksGiven/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/android/FucksGiven/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/android/FucksGiven/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp rename to android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp diff --git a/android/FucksGiven/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp rename to android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp diff --git a/android/FucksGiven/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/android/FucksGiven/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/android/FucksGiven/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp rename to android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp diff --git a/android/FucksGiven/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp rename to android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp diff --git a/android/FucksGiven/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from android/FucksGiven/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/android/FucksGiven/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/values-de/strings.xml rename to android/app/src/main/res/values-de/strings.xml diff --git a/android/FucksGiven/app/src/main/res/values-eo/strings.xml b/android/app/src/main/res/values-eo/strings.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/values-eo/strings.xml rename to android/app/src/main/res/values-eo/strings.xml diff --git a/android/FucksGiven/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/values-fr/strings.xml rename to android/app/src/main/res/values-fr/strings.xml diff --git a/android/FucksGiven/app/src/main/res/values-night-v31/themes.xml b/android/app/src/main/res/values-night-v31/themes.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/values-night-v31/themes.xml rename to android/app/src/main/res/values-night-v31/themes.xml diff --git a/android/FucksGiven/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/values-pt/strings.xml rename to android/app/src/main/res/values-pt/strings.xml diff --git a/android/FucksGiven/app/src/main/res/values-ur/strings.xml b/android/app/src/main/res/values-ur/strings.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/values-ur/strings.xml rename to android/app/src/main/res/values-ur/strings.xml diff --git a/android/FucksGiven/app/src/main/res/values-v21/styles.xml b/android/app/src/main/res/values-v21/styles.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/values-v21/styles.xml rename to android/app/src/main/res/values-v21/styles.xml diff --git a/android/FucksGiven/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/values-v31/styles.xml rename to android/app/src/main/res/values-v31/styles.xml diff --git a/android/FucksGiven/app/src/main/res/values-v31/themes.xml b/android/app/src/main/res/values-v31/themes.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/values-v31/themes.xml rename to android/app/src/main/res/values-v31/themes.xml diff --git a/android/FucksGiven/app/src/main/res/values/attrs.xml b/android/app/src/main/res/values/attrs.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/values/attrs.xml rename to android/app/src/main/res/values/attrs.xml diff --git a/android/FucksGiven/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/values/colors.xml rename to android/app/src/main/res/values/colors.xml diff --git a/android/FucksGiven/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/values/dimens.xml rename to android/app/src/main/res/values/dimens.xml diff --git a/android/FucksGiven/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/values/strings.xml rename to android/app/src/main/res/values/strings.xml diff --git a/android/FucksGiven/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/values/styles.xml rename to android/app/src/main/res/values/styles.xml diff --git a/android/FucksGiven/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/values/themes.xml rename to android/app/src/main/res/values/themes.xml diff --git a/android/FucksGiven/app/src/main/res/xml-v31/my_app_widget_info.xml b/android/app/src/main/res/xml-v31/my_app_widget_info.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/xml-v31/my_app_widget_info.xml rename to android/app/src/main/res/xml-v31/my_app_widget_info.xml diff --git a/android/FucksGiven/app/src/main/res/xml/backup_rules.xml b/android/app/src/main/res/xml/backup_rules.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/xml/backup_rules.xml rename to android/app/src/main/res/xml/backup_rules.xml diff --git a/android/FucksGiven/app/src/main/res/xml/data_extraction_rules.xml b/android/app/src/main/res/xml/data_extraction_rules.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/xml/data_extraction_rules.xml rename to android/app/src/main/res/xml/data_extraction_rules.xml diff --git a/android/FucksGiven/app/src/main/res/xml/local_config.xml b/android/app/src/main/res/xml/local_config.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/xml/local_config.xml rename to android/app/src/main/res/xml/local_config.xml diff --git a/android/FucksGiven/app/src/main/res/xml/my_app_widget_info.xml b/android/app/src/main/res/xml/my_app_widget_info.xml similarity index 100% rename from android/FucksGiven/app/src/main/res/xml/my_app_widget_info.xml rename to android/app/src/main/res/xml/my_app_widget_info.xml diff --git a/android/FucksGiven/app/src/test/java/rocks/poopjournal/fucksgiven/ExampleUnitTest.kt b/android/app/src/test/java/rocks/poopjournal/fucksgiven/ExampleUnitTest.kt similarity index 100% rename from android/FucksGiven/app/src/test/java/rocks/poopjournal/fucksgiven/ExampleUnitTest.kt rename to android/app/src/test/java/rocks/poopjournal/fucksgiven/ExampleUnitTest.kt diff --git a/android/FucksGiven/build.gradle.kts b/android/build.gradle.kts similarity index 100% rename from android/FucksGiven/build.gradle.kts rename to android/build.gradle.kts diff --git a/android/FucksGiven/gradle.properties b/android/gradle.properties similarity index 100% rename from android/FucksGiven/gradle.properties rename to android/gradle.properties diff --git a/android/FucksGiven/gradle/libs.versions.toml b/android/gradle/libs.versions.toml similarity index 100% rename from android/FucksGiven/gradle/libs.versions.toml rename to android/gradle/libs.versions.toml diff --git a/android/FucksGiven/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from android/FucksGiven/gradle/wrapper/gradle-wrapper.properties rename to android/gradle/wrapper/gradle-wrapper.properties diff --git a/android/release/baselineProfiles/0/app-release.dm b/android/release/baselineProfiles/0/app-release.dm deleted file mode 100644 index cae0d11..0000000 Binary files a/android/release/baselineProfiles/0/app-release.dm and /dev/null differ diff --git a/android/release/baselineProfiles/1/app-release.dm b/android/release/baselineProfiles/1/app-release.dm deleted file mode 100644 index 3624072..0000000 Binary files a/android/release/baselineProfiles/1/app-release.dm and /dev/null differ diff --git a/android/release/output-metadata.json b/android/release/output-metadata.json deleted file mode 100644 index ad63d75..0000000 --- a/android/release/output-metadata.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "APK", - "kind": "Directory" - }, - "applicationId": "rocks.poopjournal.fucksgiven", - "variantName": "release", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "1.0", - "outputFile": "app-release.apk" - } - ], - "elementType": "File", - "baselineProfiles": [ - { - "minApi": 28, - "maxApi": 30, - "baselineProfiles": [ - "baselineProfiles/1/app-release.dm" - ] - }, - { - "minApi": 31, - "maxApi": 2147483647, - "baselineProfiles": [ - "baselineProfiles/0/app-release.dm" - ] - } - ], - "minSdkVersionForDexing": 26 -} \ No newline at end of file diff --git a/android/FucksGiven/settings.gradle.kts b/android/settings.gradle.kts similarity index 100% rename from android/FucksGiven/settings.gradle.kts rename to android/settings.gradle.kts