diff --git a/app/build.gradle b/app/build.gradle index 309d7ca..2d3735d 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,12 +8,12 @@ android { minSdkVersion 14 targetSdkVersion 36 versionCode 8 - versionName "1.0.1" + versionName "1.0.2" } buildTypes { release { minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } } @@ -30,5 +30,5 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) // https://mvnrepository.com/artifact/com.android.support/appcompat-v7 - implementation group: 'com.android.support', name: 'appcompat-v7', version: '28.0.0' + implementation "com.android.support:appcompat-v7:28.0.0" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8c7980c..431737a 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,8 +7,7 @@ = 21) { - createListSpec.setIndicator("Choose List", getDrawable(R.drawable.dr_face_straight2_circle)); + createListSpec.setIndicator("Choose List", getDrawable(R.drawable.add)); } else{ createListSpec.setIndicator("Choose List"); @@ -87,7 +87,7 @@ public class Main extends TabActivity { // Settings/About Tab TabHost.TabSpec mySettingsSpec = tabHost.newTabSpec("Settings"); if (Build.VERSION.SDK_INT >= 21) { - mySettingsSpec.setIndicator("Settings", getDrawable(R.drawable.figsy_grass_circle_small)); + mySettingsSpec.setIndicator("Settings", getDrawable(R.drawable.settings)); } else{ mySettingsSpec.setIndicator("Settings"); diff --git a/app/src/main/res/drawable-anydpi/add.xml b/app/src/main/res/drawable-anydpi/add.xml new file mode 100644 index 0000000..e04cd0c --- /dev/null +++ b/app/src/main/res/drawable-anydpi/add.xml @@ -0,0 +1,31 @@ + + + + + + diff --git a/app/src/main/res/drawable-anydpi/settings.xml b/app/src/main/res/drawable-anydpi/settings.xml new file mode 100644 index 0000000..7382b8b --- /dev/null +++ b/app/src/main/res/drawable-anydpi/settings.xml @@ -0,0 +1,31 @@ + + + + + + diff --git a/app/src/main/res/drawable-hdpi/add.png b/app/src/main/res/drawable-hdpi/add.png new file mode 100644 index 0000000..d71a8d8 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/add.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png deleted file mode 100755 index 96a442e..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/settings.png b/app/src/main/res/drawable-hdpi/settings.png new file mode 100644 index 0000000..519b5ad Binary files /dev/null and b/app/src/main/res/drawable-hdpi/settings.png differ diff --git a/app/src/main/res/drawable-mdpi/add.png b/app/src/main/res/drawable-mdpi/add.png new file mode 100644 index 0000000..3274687 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/add.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png deleted file mode 100755 index 359047d..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/settings.png b/app/src/main/res/drawable-mdpi/settings.png new file mode 100644 index 0000000..09cf824 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/settings.png differ diff --git a/app/src/main/res/drawable-xhdpi/add.png b/app/src/main/res/drawable-xhdpi/add.png new file mode 100644 index 0000000..3013621 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/add.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png deleted file mode 100755 index 71c6d76..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/settings.png b/app/src/main/res/drawable-xhdpi/settings.png new file mode 100644 index 0000000..58acd8c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/settings.png differ diff --git a/app/src/main/res/drawable-xxhdpi/add.png b/app/src/main/res/drawable-xxhdpi/add.png new file mode 100644 index 0000000..8c5ff10 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/add.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100755 index 4df1894..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/settings.png b/app/src/main/res/drawable-xxhdpi/settings.png new file mode 100644 index 0000000..dc566be Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/settings.png differ diff --git a/app/src/main/res/drawable/ic_launcher_monochrome.xml b/app/src/main/res/drawable/ic_launcher_monochrome.xml new file mode 100644 index 0000000..a2c48c5 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_monochrome.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..4df90c3 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..4df90c3 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..6f0abb2 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..320c23f Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..734b272 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..6f0abb2 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..33f85dc Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..aff2c80 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..8850ed0 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..33f85dc Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..50333ac Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..a2374d9 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..1d9c599 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..50333ac Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..830066f Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..cceaeff Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..16b1128 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..830066f Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..33146ae Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..3b8e26b Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..e81ee93 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..33146ae Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..c5d5899 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7a69217..4e34658 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,7 +7,7 @@ Settings Main -= Version Mango =- - -= v1.0.1 =- + -= v1.0.2 =- Hyperling diff --git a/art/ctfu.png b/art/icons/ctfu.png similarity index 100% rename from art/ctfu.png rename to art/icons/ctfu.png diff --git a/app/src/main/res/drawable-hdpi/dr_face_straight2_circle.png b/art/icons/dr_face_straight2_circle.png similarity index 100% rename from app/src/main/res/drawable-hdpi/dr_face_straight2_circle.png rename to art/icons/dr_face_straight2_circle.png diff --git a/app/src/main/res/drawable-hdpi/dr_face_straight2_square.png b/art/icons/dr_face_straight2_square.png similarity index 100% rename from app/src/main/res/drawable-hdpi/dr_face_straight2_square.png rename to art/icons/dr_face_straight2_square.png diff --git a/art/figsy.xcf b/art/icons/figsy.xcf similarity index 100% rename from art/figsy.xcf rename to art/icons/figsy.xcf diff --git a/app/src/main/res/drawable-hdpi/figsy_grass_circle_full.png b/art/icons/figsy_grass_circle_full.png similarity index 100% rename from app/src/main/res/drawable-hdpi/figsy_grass_circle_full.png rename to art/icons/figsy_grass_circle_full.png diff --git a/app/src/main/res/drawable-hdpi/figsy_grass_circle_medium.png b/art/icons/figsy_grass_circle_medium.png similarity index 100% rename from app/src/main/res/drawable-hdpi/figsy_grass_circle_medium.png rename to art/icons/figsy_grass_circle_medium.png diff --git a/app/src/main/res/drawable-hdpi/figsy_grass_circle_small.png b/art/icons/figsy_grass_circle_small.png similarity index 100% rename from app/src/main/res/drawable-hdpi/figsy_grass_circle_small.png rename to art/icons/figsy_grass_circle_small.png diff --git a/app/src/main/res/drawable-hdpi/figsy_grass_full.jpg b/art/icons/figsy_grass_full.jpg similarity index 100% rename from app/src/main/res/drawable-hdpi/figsy_grass_full.jpg rename to art/icons/figsy_grass_full.jpg diff --git a/art/icons/lumo_rice_01.png b/art/icons/lumo_rice_01.png new file mode 100644 index 0000000..2b83427 Binary files /dev/null and b/art/icons/lumo_rice_01.png differ diff --git a/art/icons/lumo_rice_01_mc.png b/art/icons/lumo_rice_01_mc.png new file mode 100644 index 0000000..88db21a Binary files /dev/null and b/art/icons/lumo_rice_01_mc.png differ diff --git a/build.gradle b/build.gradle index bfc1796..f35911e 100755 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:8.11.1' + classpath 'com.android.tools.build:gradle:9.4.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -27,6 +27,6 @@ allprojects { } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/com.hyperling.carbupbeta.yml b/com.hyperling.carbupbeta.yml index 16210d4..91d5e28 100644 --- a/com.hyperling.carbupbeta.yml +++ b/com.hyperling.carbupbeta.yml @@ -1,11 +1,16 @@ AuthorName: 'Chad Michael "Hyperling" Greenwood' -SourceCode: 'https://git.hyperling.com/me/android-carb-up/' -WebSite: 'https://hyperling.com/apps' +AuthorWebSite: 'https://hyperling.com/about/' +Donate: 'https://hyperling.com/donate/' +Liberapay: 'HyperVegan' +Bitcoin: 'bc1qsfe8dkvry3d34kztz449gkq67wq8fu2nkgfkh0' +Litecoin: 'ltc1qavmpu5d6ljntxsd6jj548m4yys83zwscl0dzkx' +IssueTracker: 'https://hyperling.com/contact/' Categories: - fdroid - hyperling - utilities -CurrentVersionCode: 2147483647 -IssueTracker: 'mailto:me@hyperling.com' Name: Carb Up! Helper +AuthorEmail: 'me+carbup@hyperling.com' Summary: 'Calculate cost-effective foods on a High Carb Low Fat lifestyle.' +SourceCode: 'https://git.hyperling.com/me/android-carb-up/' +WebSite: 'https://hyperling.com/apps/#ctfu' diff --git a/gradle.properties b/gradle.properties index 1d3591c..d59d766 100755 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,15 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.builtInKotlin=false +android.defaults.buildfeatures.resvalues=true +android.dependency.useConstraints=true +android.enableAppCompileTimeRClass=false +android.newDsl=false +android.r8.optimizedResourceShrinking=false +android.r8.strictFullModeForKeepRules=false +android.sdk.defaultTargetSdkToCompileSdkIfUnset=false +android.uniquePackageNames=false +android.useAndroidX=false +android.usesSdkInManifest.disallowed=false \ No newline at end of file diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties new file mode 100644 index 0000000..baa28d1 --- /dev/null +++ b/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,13 @@ +#This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/491f83666ae7f4d6ebb28fee72ebb035/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/0d1a1acdc708062093673f65aa9aba4b/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/491f83666ae7f4d6ebb28fee72ebb035/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/0d1a1acdc708062093673f65aa9aba4b/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7083b89563e7ce20943037b8cd2b8cc2/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/060bbb778a1f55ea705fdebd2ccfeab9/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/491f83666ae7f4d6ebb28fee72ebb035/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/0d1a1acdc708062093673f65aa9aba4b/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d09679dc60fe5aa05ef7d03efdefac20/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/ed4e3bf2f5e7c5d9aabc4cbd8acd555e/redirect +toolchainVendor=JETBRAINS +toolchainVersion=21 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fe52e99..0c05365 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Jul 11 14:14:34 MST 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index e7b4def..4555e12 100755 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,4 @@ +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' +} include ':app'