diff --git a/.github/workflows/googleformatter.yml b/.github/workflows/googleformatter.yml
new file mode 100644
index 00000000..edf26b70
--- /dev/null
+++ b/.github/workflows/googleformatter.yml
@@ -0,0 +1,19 @@
+name: Java-code Formatter
+
+on:
+ pull_request:
+ paths-ignore:
+ - '**.md'
+ - '**.gradle'
+ - '**.xml'
+ workflow_dispatch:
+
+jobs:
+ formatting:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+ - uses: axel-op/googlejavaformat-action@v3.6.0
+ with:
+ args: '--replace --aosp --skip-reflowing-long-strings'
+ commitMessage: "refactor: Format Java-code [skip ci]"
diff --git a/app/build.gradle b/app/build.gradle
index 47459fb4..84868e98 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,23 +1,19 @@
-
plugins {
id 'com.android.application'
-
}
android {
namespace 'nethical.digipaws'
compileSdk 33
-
+
defaultConfig {
applicationId "nethical.digipaws"
minSdk 24
targetSdk 33
versionCode 1
versionName "1.0"
-
- vectorDrawables {
- useSupportLibrary true
- }
+
+ vectorDrawables.useSupportLibrary true
}
buildTypes {
@@ -34,20 +30,17 @@ android {
buildFeatures {
viewBinding true
-
}
-
}
dependencies {
-
-
- implementation "androidx.preference:preference:1.2.1"
+ implementation 'androidx.preference:preference:1.2.1'
implementation 'androidx.appcompat:appcompat:1.3.1'
- implementation 'com.google.android.material:material:1.4.0'
- implementation 'com.google.code.gson:gson:2.8.8'
- implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+ implementation 'com.google.android.material:material:1.4.0'
+ implementation 'com.google.code.gson:gson:2.8.8'
implementation 'com.google.android.gms:play-services-location:19.0.1'
- implementation"org.osmdroid:osmdroid-android:6.1.18"
+
+ implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+ implementation 'org.osmdroid:osmdroid-android:6.1.18'
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3b78cbaa..144f966c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,28 +1,23 @@
-
+
+
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
-
-
-
-
+
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
-
-
\ No newline at end of file
+
diff --git a/app/src/main/res/anim/fade_enter.xml b/app/src/main/res/anim/fade_enter.xml
index 951feb40..b9225a17 100644
--- a/app/src/main/res/anim/fade_enter.xml
+++ b/app/src/main/res/anim/fade_enter.xml
@@ -3,4 +3,4 @@
android:duration="@android:integer/config_shortAnimTime"
android:fromAlpha="0.0"
android:interpolator="@android:anim/linear_interpolator"
- android:toAlpha="1.0" />
\ No newline at end of file
+ android:toAlpha="1.0" />
diff --git a/app/src/main/res/anim/fade_exit.xml b/app/src/main/res/anim/fade_exit.xml
index 019cb177..d817d0c3 100644
--- a/app/src/main/res/anim/fade_exit.xml
+++ b/app/src/main/res/anim/fade_exit.xml
@@ -3,4 +3,4 @@
android:duration="@android:integer/config_shortAnimTime"
android:fromAlpha="1.0"
android:interpolator="@android:anim/linear_interpolator"
- android:toAlpha="0.0" />
\ No newline at end of file
+ android:toAlpha="0.0" />
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
index 2b068d11..7706ab9e 100644
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -27,4 +27,4 @@
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/activity_launcher.xml b/app/src/main/res/layout/activity_launcher.xml
index 67763bc3..89cb65a7 100644
--- a/app/src/main/res/layout/activity_launcher.xml
+++ b/app/src/main/res/layout/activity_launcher.xml
@@ -1,17 +1,16 @@
+
+
-
-
+ android:clipToPadding="true"
+ android:fitsSystemWindows="true" />
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 903156cc..84311afb 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,10 +1,5 @@
-
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/fragment_launcher_apps.xml b/app/src/main/res/layout/fragment_launcher_apps.xml
index 74104f4e..d68c0e8b 100644
--- a/app/src/main/res/layout/fragment_launcher_apps.xml
+++ b/app/src/main/res/layout/fragment_launcher_apps.xml
@@ -1,33 +1,32 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_launcher_home.xml b/app/src/main/res/layout/fragment_launcher_home.xml
index 4d587c1e..e5a59466 100644
--- a/app/src/main/res/layout/fragment_launcher_home.xml
+++ b/app/src/main/res/layout/fragment_launcher_home.xml
@@ -2,14 +2,14 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:fitsSystemWindows="true" >
+ android:fitsSystemWindows="true">
+ android:orientation="vertical">
-
-
-
-
+ android:background="@color/colorControlNormal"
+ android:padding="8dp">
+
+
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/fragment_location_quest.xml b/app/src/main/res/layout/fragment_location_quest.xml
index dcdeae35..5d93aa28 100644
--- a/app/src/main/res/layout/fragment_location_quest.xml
+++ b/app/src/main/res/layout/fragment_location_quest.xml
@@ -1,11 +1,11 @@
+ android:layout_height="match_parent">
-
+ android:padding="8dp">
-
+
+ android:text="Take your phone out of this red zone to unlock device." />
+
-
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 08dd0b91..33f416be 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -1,17 +1,13 @@
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_survival.xml b/app/src/main/res/layout/fragment_survival.xml
index c45b46bb..193a2846 100644
--- a/app/src/main/res/layout/fragment_survival.xml
+++ b/app/src/main/res/layout/fragment_survival.xml
@@ -1,7 +1,4 @@
-
-
\ No newline at end of file
+ android:orientation="vertical" />
diff --git a/app/src/main/res/layout/item_app.xml b/app/src/main/res/layout/item_app.xml
index 6272f4db..9095bc1f 100644
--- a/app/src/main/res/layout/item_app.xml
+++ b/app/src/main/res/layout/item_app.xml
@@ -1,26 +1,25 @@
-
-
-
-
-
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/item_app_select.xml b/app/src/main/res/layout/item_app_select.xml
index 44de8ab7..2be4ca77 100644
--- a/app/src/main/res/layout/item_app_select.xml
+++ b/app/src/main/res/layout/item_app_select.xml
@@ -2,10 +2,10 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical" >
+ android:orientation="vertical">
-
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@color/app_background_color"
+ android:padding="50dp">
-
+
-
+
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/quest_dialog.xml b/app/src/main/res/layout/quest_dialog.xml
index c45b46bb..193a2846 100644
--- a/app/src/main/res/layout/quest_dialog.xml
+++ b/app/src/main/res/layout/quest_dialog.xml
@@ -1,7 +1,4 @@
-
-
\ No newline at end of file
+ android:orientation="vertical" />
diff --git a/app/src/main/res/layout/widget_layout.xml b/app/src/main/res/layout/widget_layout.xml
index 6d44ecf0..1351b1dc 100644
--- a/app/src/main/res/layout/widget_layout.xml
+++ b/app/src/main/res/layout/widget_layout.xml
@@ -1,35 +1,34 @@
-
+
-
-
+
+
+ android:textSize="12sp" />
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:src="@drawable/paws" />
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cf4fd05e..f42df280 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,13 +1,13 @@
- #1c1b1f
- #100f13
- #00C853
- #2ECC71
- #29272a
- #1C1B1F
- #A7948B
- #E5E1E5
-
- #808080
- #90EE90
+ #1c1b1f
+ #100f13
+ #00C853
+ #2ECC71
+ #29272a
+ #1C1B1F
+ #A7948B
+ #E5E1E5
+
+ #808080
+ #90EE90
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1d082e30..89e33527 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,8 +1,6 @@
Digipaws
You have %d remaining attempts. Exceeding this limit will result in a penalty.
-
Blocked
-
-
\ No newline at end of file
+
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 214c6972..356986cc 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,27 +1,27 @@
-
-
-
-
+
+
+
+
+
+
diff --git a/app/src/main/res/xml/device_admin_receiver.xml b/app/src/main/res/xml/device_admin_receiver.xml
index 01983b99..56a3705b 100644
--- a/app/src/main/res/xml/device_admin_receiver.xml
+++ b/app/src/main/res/xml/device_admin_receiver.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/app/src/main/res/xml/preference_adv.xml b/app/src/main/res/xml/preference_adv.xml
index fcab1043..afe2589e 100644
--- a/app/src/main/res/xml/preference_adv.xml
+++ b/app/src/main/res/xml/preference_adv.xml
@@ -1,16 +1,11 @@
-
-
-
+
-
-
-
-
-
+ android:title="Disable Uninstall" />
+
diff --git a/app/src/main/res/xml/preference_content_blockers.xml b/app/src/main/res/xml/preference_content_blockers.xml
index bdb02a79..13fb8210 100644
--- a/app/src/main/res/xml/preference_content_blockers.xml
+++ b/app/src/main/res/xml/preference_content_blockers.xml
@@ -1,8 +1,7 @@
-
-
-
-
-
+
+
diff --git a/app/src/main/res/xml/preference_launcher.xml b/app/src/main/res/xml/preference_launcher.xml
index cb454001..72b6293a 100644
--- a/app/src/main/res/xml/preference_launcher.xml
+++ b/app/src/main/res/xml/preference_launcher.xml
@@ -1,23 +1,14 @@
+
-
-
-
-
-
+
-
-
-
-
-
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 6b40d738..4237a6d0 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,32 +1,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
diff --git a/app/src/main/res/xml/stop_view_service_config.xml b/app/src/main/res/xml/stop_view_service_config.xml
index 53e0ed95..0a724050 100644
--- a/app/src/main/res/xml/stop_view_service_config.xml
+++ b/app/src/main/res/xml/stop_view_service_config.xml
@@ -5,7 +5,6 @@
android:accessibilityFlags="flagDefault"
android:canRetrieveWindowContent="true"
android:description="@string/app_name"
- android:notificationTimeout="1000"
- android:packageNames="com.google.android.youtube,com.instagram.android,com.reddit.frontpage"
- />
+ android:notificationTimeout="1000"
+ android:packageNames="com.google.android.youtube,com.instagram.android,com.reddit.frontpage" />
diff --git a/app/src/main/res/xml/widget_info.xml b/app/src/main/res/xml/widget_info.xml
index 2851d2fa..d9546f48 100644
--- a/app/src/main/res/xml/widget_info.xml
+++ b/app/src/main/res/xml/widget_info.xml
@@ -6,4 +6,4 @@
android:targetCellHeight="2"
android:updatePeriodMillis="500"
android:widgetCategory="home_screen"
- android:resizeMode="none" />
\ No newline at end of file
+ android:resizeMode="none" />
diff --git a/build.gradle b/build.gradle
index ca1aead9..1bf464e2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,9 +2,8 @@
plugins {
id 'com.android.application' version '8.0.0' apply false
id 'com.android.library' version '8.0.0' apply false
-
}
task clean(type: Delete) {
delete rootProject.buildDir
-}
\ No newline at end of file
+}