Other maintenance commits

.gitlab-ci.yml

@@ -34,6 +34,7 @@ unitTests:
 build:
   stage: build
   script:
+    - ./gradlew assembleRelease
     - ./gradlew assembleDebug
   artifacts:
     paths:

README.md

 ![CI bagde](https://gitlab.com/xphnx/ameixa/badges/master/build.svg)
 
-Icon pack compatible with Trebuchet, Kiss Launcher, Lawnchair Launcher, OpenLauncher, Adw and many more launchers. A Material Design inspired theme aiming to provide a consistent and minimalistic look to your device. Code forked from [Icecons icon pack](https://github.com/1C3/ICEcons). Only [F-Droid](https://f-droid.org/) hosted apps are supported.
-
+Icon pack compatible with Trebuchet, Kiss Launcher, Lawnchair Launcher, OpenLauncher, Adw, and many more launchers. A Material Design inspired theme aiming to provide a consistent and minimalistic look to your device. Code forked from [Icecons icon pack](https://github.com/1C3/ICEcons). Only [F-Droid](https://f-droid.org/) hosted apps are supported.
 
 # Contributions are welcome 
 
@@ -47,10 +46,14 @@ For requesting icons or contributing, please use the [Issue Tracker](https://git
 -->
 
 # Installation
-
-[![Get_it_on_F-Droid.svg](https://fdroid.gitlab.io/artwork/badge/get-it-on.png)](https://f-droid.org/app/org.xphnx.ameixa)
-[![Get_the_apk.svg](https://gitlab.com/xphnx/ameixa/uploads/6d80e2e22d2fcbfd8ed320e58f4705e1/apk.png)](https://gitlab.com/xphnx/ameixa/-/jobs/85391706/artifacts/browse/app/build/outputs/apk/)
-
+<a href="https://f-droid.org/app/org.xphnx.ameixa">
+    <img src="https://f-droid.org/badge/get-it-on.png"
+    alt="Get it on F-Droid" height="80">
+</a>
+<a href="https://gitlab.com/xphnx/ameixa/-/jobs/86232495/artifacts/file/app/build/outputs/apk/debug/app-debug.apk">
+    <img src="https://gitlab.com/xphnx/ameixa/uploads/6d80e2e22d2fcbfd8ed320e58f4705e1/apk.png"
+    alt="Download debug apk" height="80">
+</a>
 
 # License
 

app/build.gradle

@@ -25,9 +25,15 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        debug {
+            zipAlignEnabled true
+            applicationIdSuffix ".debug"
+            versionNameSuffix "-debug"
+        }
     }
 }
 

app/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
-<!--
- * This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*
-* @author xphnx based on Icecons (https://github.com/1C3/ICEcons)
-*
--->
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.xphnx.ameixa">
+    package="org.xphnx.ameixa" android:installLocation="auto">
 
     <application
         android:allowBackup="true"

app/src/main/java/org/xphnx/ameixa/LicenseActivity.java

@@ -52,12 +52,7 @@ public class LicenseActivity extends AppCompatActivity {
         sourceClickLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
         sourceClickLayout.setGravity(Gravity.CENTER);
         sourceLayout.addView(sourceClickLayout);
-        sourceClickLayout.setOnClickListener( new View.OnClickListener() {
-            @Override
-            public void onClick( View v ) {
-                gplLink( v );
-            }
-        });
+        sourceClickLayout.setOnClickListener((View v) -> gplLink(v));
 
         TextView sourceText = new TextView(this);
         sourceText.setText(R.string.codelicense);
@@ -80,12 +75,7 @@ public class LicenseActivity extends AppCompatActivity {
         imgClickLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
         imgClickLayout.setGravity(Gravity.CENTER);
         imgLayout.addView(imgClickLayout);
-        imgClickLayout.setOnClickListener( new View.OnClickListener() {
-            @Override
-            public void onClick( View v ) {
-                ccLink( v );
-            }
-        });
+        imgClickLayout.setOnClickListener((View v) -> ccLink(v));
 
         TextView aboutText = new TextView(this);
         aboutText.setText(R.string.imageslicense);
@@ -93,7 +83,6 @@ public class LicenseActivity extends AppCompatActivity {
         aboutText.setTextColor(0xffffffff);
         aboutText.setPadding(padding, padding, padding, padding);
         imgClickLayout.addView(aboutText);
-
     }
 
     public void gplLink(View v) {

app/src/main/java/org/xphnx/ameixa/MainActivity.java

@@ -42,8 +42,6 @@ public class MainActivity extends AppCompatActivity {
         baseLayout.setGravity(Gravity.START);
         frameLayout.addView(baseLayout);
 
- 
-
         // source code button
 
         LinearLayout sourceLayout = new LinearLayout(this);
@@ -57,12 +55,7 @@ public class MainActivity extends AppCompatActivity {
         sourceClickLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
         sourceClickLayout.setGravity(Gravity.CENTER);
         sourceLayout.addView(sourceClickLayout);
-        sourceClickLayout.setOnClickListener( new View.OnClickListener() {
-            @Override
-            public void onClick( View v ) {
-                gitLink( v );
-            }
-        });
+        sourceClickLayout.setOnClickListener((View v) -> gitLink(v));
 
         Button sourceButton = new Button(this);
         sourceButton.setLayoutParams(buttonParams);
@@ -90,12 +83,7 @@ public class MainActivity extends AppCompatActivity {
         aboutClickLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
         aboutClickLayout.setGravity(Gravity.CENTER);
         aboutLayout.addView(aboutClickLayout);
-        aboutClickLayout.setOnClickListener( new View.OnClickListener() {
-            @Override
-            public void onClick( View v ) {
-                licenseShow( v );
-            }
-        });
+        aboutClickLayout.setOnClickListener((View v) -> licenseShow(v));
 
         Button aboutButton = new Button(this);
         aboutButton.setLayoutParams(buttonParams);
@@ -109,7 +97,6 @@ public class MainActivity extends AppCompatActivity {
         aboutText.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.colorPrimaryDark));
         aboutText.setPadding(64, 64, 64, 64);
         aboutClickLayout.addView(aboutText);
-
     }
 
     public void gitLink(View v) {
@@ -119,9 +106,7 @@ public class MainActivity extends AppCompatActivity {
         startActivity(intent);
     }
 
-
     public void licenseShow(View v) {
-
         Intent intent = new Intent(this, LicenseActivity.class);
         startActivity(intent);
     }

app/src/main/res/values/strings.xml

 <resources>
     <string name="app_name">Ameixa</string>
-    <string name="sourcecodetext">source code</string>
-    <string name="licensetext">license</string>
+    <string name="sourcecodetext">Source code</string>
+    <string name="licensetext">License</string>
     <string name="sourcecodelink">https://gitlab.com/xphnx/ameixa</string>
-    <string name="codelicense">This program\'s source code is avaiable under the GNU General Public License v3.</string>
-    <string name="imageslicense">The images included in this program are avaiable under the Creative Commons Attribution Share Alike 4.0 license, except for non-compatible derivates licenses (See credits).</string>
-    <string name="urlgplv3">http://choosealicense.com/licenses/gpl-3.0/</string>
-    <string name="urlccbysa4">https://creativecommons.org/licenses/by-sa/4.0/</string>
+    <string name="codelicense">This program\'s source code is available under the GNU General Public License v3.</string>
+    <string name="imageslicense">The images included in this program are available under the Creative Commons Attribution Share Alike 4.0 license, except for non-compatible derivative licenses (see credits).</string>
+    <string name="urlgplv3">https://choosealicense.com/licenses/gpl-3.0</string>
+    <string name="urlccbysa4">https://creativecommons.org/licenses/by-sa/4.0</string>
     <bool name="config_iconpack">true</bool>
 </resources>
\ No newline at end of file
-

app/src/main/res/xml/appfilter.xml

 <?xml version="1.0" encoding="utf-8"?>
-<!--
- * This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-* @author xphnx
-*/
--->
 
 <resources>
 
@@ -1441,8 +1426,6 @@
 <item component="ComponentInfo{com.cityzen.cityzen/com.cityzen.cityzen.Activities.SplashScreenActivity}" drawable="cityzen"/>
 <item component="ComponentInfo{io.github.hidroh.materialistic/io.github.hidroh.materialistic.LauncherActivity}" drawable="hn" />
 
-
-
     <!-- Nova Launcher specific -->
     <item component=":BROWSER" drawable="browser" />
     <item component=":CALCULATOR" drawable="calculator" />

fastlane/metadata/android/en-US/full_description.txt

-Icon pack compatible with Kiss Launcher, OpenLauncher, ADW and many other launchers. The icons follow Material Design guidelines in order to provide a minimalist and consistent look to your device.
+Icon pack compatible with Kiss Launcher, OpenLauncher, Lawnchair Launcher, ADW and many other launchers. The icons follow Material Design guidelines in order to provide a minimalist and consistent look to your device.
 Only FLOSS apps are supported. For adding new icons see <a href="https://gitlab.com/xphnx/ameixa/blob/master/README.md">Readme</a>.

gradlew.bat

+@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 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=-Xmx128m -Dfile.encoding=UTF-8
+
+@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 init
+
+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 init
+
+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
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+: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 %CMD_LINE_ARGS%
+
+: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
\ No newline at end of file

todo/wip/1Note.md

 1. Place the svgs to be included in the next update here.
-2. (Optional) Run the script (process_wipsvg.sh). It generates proper pngs from each svg and move from "todo/wip" to "icons". And writes the iconpack.xml and drawable.xml.
-
+2. (Optional) Run the script (process_wipsvg.sh). It generates proper pngs from each svg, moves them from "todo/wip" to "icons", and writes to iconpack.xml and drawable.xml.
\ No newline at end of file