Skip to content
Snippets Groups Projects
Commit 4894a358 authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Fix application name

parent cfd5768e
No related branches found
No related tags found
1 merge request!3Fix application name
Pipeline #327 passed
Stage: test
Stage: build
Show whitespace changes
Inline Side-by-side
Showing
with 28 additions and 91 deletions
README.md
+ 1
− 63
View file @ 4894a358
![CI badge](https://gitlab.com/xphnx/ameixa/badges/master/build.svg)
Icon pack compatible with Trebuchet, Kiss Launcher, Lawnchair Launcher, OpenLauncher, Adw, and many more launchers (basically any launcher that supports icon packs).
It's a material design inspired theme that aims 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
For requesting icons or contributing, please use the [Issue Tracker](https://gitlab.com/xphnx/ameixa/issues) or [Merge Requests](https://gitlab.com/xphnx/ameixa/merge_requests)
#### What happens?
* [ ] The activityname line is in [appfilter.xml](https://gitlab.com/xphnx/ameixa/blob/master/app/src/main/res/xml/appfilter.xml)
* [ ] The activityname has changed or is not in [appfilter.xml](https://gitlab.com/xphnx/ameixa/blob/master/app/src/main/res/xml/appfilter.xml) --> Use [Turtl](https://f-droid.org/packages/org.xphnx.iconsubmit) to find out the activityname line to be included in appfilter.xml
</br>
* [ ] The icon is in the [icons folder](https://gitlab.com/xphnx/ameixa/tree/master/icons)
* [ ] The icon is in the [todo/wip folder](https://gitlab.com/xphnx/ameixa/tree/master/todo/wip)
* [ ] There is no proper icon in todo/wip or icons --> Grab a [template](https://gitlab.com/xphnx/ameixa/tree/master/templates) and draw a new icon. (More [info](https://gitlab.com/xphnx/twelf_cm12_theme/wikis/home))
</br>
* [ ] The icon file name and the drawable string in the activityname line doesn't match --> Fix activityname
#### What to do? (You have 4 options:)
1. Write a new activityname in [Issue Tracker](https://gitlab.com/xphnx/ameixa/issues)
2. Attach the new icon (.svg) in [Issue Tracker](https://gitlab.com/xphnx/ameixa/issues)
3. [MR](https://gitlab.com/xphnx/ameixa/merge_requests) activityname lines into appfilter.xml and/or icon files (.svg) into todo/wip
4. [MR](https://gitlab.com/xphnx/ameixa/merge_requests) activityname and/or icon data (.pngs and xml) after running the script [process_wipsvg-xml.sh](https://gitlab.com/xphnx/ameixa/blob/master/process_wipsvg-xml.sh)
# Screenshots
![screenshot1-thumb](/uploads/c1b689614b683cff658c3d8245ef6cea/screenshot1-thumb.jpg)
![screenshot2-thumb](/uploads/833855214502447743662f1e010db19e/screenshot2-thumb.jpg)
<!--<img src="https://gitlab.com/xphnx/twelf_cm12_theme/uploads/97c6faf3cad4619e8079327a5e3d3ac4/Screenshot_2015-05-23-07-53-03.png" alt="with a dark background" width="300" />
<img src="https://gitlab.com/xphnx/ameixa/uploads/6a11ca228921b18225e700f6d37fcbe8/photo5463050469409663049.jpg" alt="with a dark background" width="300" />
<img src="https://gitlab.com/xphnx/twelf_cm12_theme/uploads/b0ef81d60e8f4470e41cfec54c4a85b0/Screenshot_2015-05-23-21-03-30.png" alt="into apex launcher" width="300" />
<img src="https://gitlab.com/xphnx/twelf_cm12_theme/uploads/081953c26fe1f8d30276f1d16bb0f672/Screenshot_2015-05-22-10-51-04.png" alt="light background" width="300" />
<img src="https://gitlab.com/xphnx/twelf_cm12_theme/uploads/cec2077cb5bb09008b98d7c8681af67c/Screenshot_2015-05-22-23-47-06.png" alt="apps settings" width="300" />
<img src="https://gitlab.com/xphnx/twelf_cm12_theme/uploads/27787db387074995a36f18c262f4abba/Screenshot_2015-06-09-22-21-20.png" alt="share feneec" width="300" />
<img src="https://gitlab.com/xphnx/twelf_cm12_theme/uploads/a49b1be4708a70c2e3c554342ba21edb/Screenshot_2015-05-22-23-55-18.png" alt="inside afw++" width="300" />
-->
# Installation
<a href="https://f-droid.org/packages/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/artifacts/master/download?job=build">
<img src="https://hike.in/images/hike5.0/apk.png"
alt="Download the latest build" height="80">
</a>
# License
<img src="https://gnu.org/graphics/gplv3-127x51.png" />
[GPLv3](https://www.gnu.org/licenses/gpl-3.0.html) and other libre / open licenses for the artwork (see [CREDITS](https://gitlab.com/xphnx/ameixa/blob/master/CREDITS.md) for more details)
forked from [ameixa](https://gitlab.com/xphnx/ameixa) to add some non free icons
app/build.gradle
+ 1
− 1
View file @ 4894a358
......@@ -5,7 +5,7 @@ android {
buildToolsVersion '28.0.3'
defaultConfig {
applicationId "org.xphnx.ameixa"
applicationId "org.benoitharrault.ameixanonfree"
minSdkVersion 16
targetSdkVersion 28
versionCode 412
......
app/src/main/AndroidManifest.xml
+ 2
− 2
View file @ 4894a358
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.xphnx.ameixa"
package="org.benoitharrault.ameixanonfree"
android:installLocation="auto">
<application
......
app/src/main/java/org/xphnx/ameixa/activities/BaseActivity.java
+ 2
− 2
View file @ 4894a358
package org.xphnx.ameixa.activities;
package org.benoitharrault.ameixanonfree.activities;
import android.os.Build;
import android.os.Bundle;
import android.view.WindowManager;
import org.xphnx.ameixa.R;
import org.benoitharrault.ameixanonfree.R;
import androidx.appcompat.app.AppCompatActivity;
......
app/src/main/java/org/xphnx/ameixa/activities/IconActivity.java
+ 4
− 4
View file @ 4894a358
package org.xphnx.ameixa.activities;
package org.benoitharrault.ameixanonfree.activities;
import android.graphics.Rect;
import android.os.Bundle;
......@@ -9,9 +9,9 @@ import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
import android.widget.ScrollView;
import org.xphnx.ameixa.R;
import org.xphnx.ameixa.utils.ImageUtils;
import org.xphnx.ameixa.utils.ScreenUtils;
import org.benoitharrault.ameixanonfree.R;
import org.benoitharrault.ameixanonfree.utils.ImageUtils;
import org.benoitharrault.ameixanonfree.utils.ScreenUtils;
import java.util.ArrayList;
......
app/src/main/java/org/xphnx/ameixa/activities/LicenseActivity.java
+ 3
− 3
View file @ 4894a358
package org.xphnx.ameixa.activities;
package org.benoitharrault.ameixanonfree.activities;
import android.content.Intent;
import android.net.Uri;
......@@ -9,8 +9,8 @@ import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
import android.widget.TextView;
import org.xphnx.ameixa.R;
import org.xphnx.ameixa.utils.ScreenUtils;
import org.benoitharrault.ameixanonfree.R;
import org.benoitharrault.ameixanonfree.utils.ScreenUtils;
public class LicenseActivity extends BaseActivity {
......
app/src/main/java/org/xphnx/ameixa/activities/MainActivity.java
+ 4
− 4
View file @ 4894a358
package org.xphnx.ameixa.activities;
package org.benoitharrault.ameixanonfree.activities;
import android.content.Intent;
import android.graphics.drawable.BitmapDrawable;
......@@ -12,9 +12,9 @@ import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
import android.widget.TextView;
import org.xphnx.ameixa.R;
import org.xphnx.ameixa.utils.ImageUtils;
import org.xphnx.ameixa.utils.ScreenUtils;
import org.benoitharrault.ameixanonfree.R;
import org.benoitharrault.ameixanonfree.utils.ImageUtils;
import org.benoitharrault.ameixanonfree.utils.ScreenUtils;
import androidx.core.content.ContextCompat;
......
app/src/main/java/org/xphnx/ameixa/async/BitmapLoadTask.java
+ 3
− 3
View file @ 4894a358
package org.xphnx.ameixa.async;
package org.benoitharrault.ameixanonfree.async;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.os.AsyncTask;
import org.xphnx.ameixa.interfaces.BitmapListener;
import org.xphnx.ameixa.utils.ImageUtils;
import org.benoitharrault.ameixanonfree.interfaces.BitmapListener;
import org.benoitharrault.ameixanonfree.utils.ImageUtils;
public class BitmapLoadTask extends AsyncTask<Integer, Void, Bitmap> {
......
app/src/main/java/org/xphnx/ameixa/interfaces/BitmapListener.java
+ 1
− 1
View file @ 4894a358
package org.xphnx.ameixa.interfaces;
package org.benoitharrault.ameixanonfree.interfaces;
import android.graphics.Bitmap;
......
app/src/main/java/org/xphnx/ameixa/utils/ImageUtils.java
+ 2
− 2
View file @ 4894a358
package org.xphnx.ameixa.utils;
package org.benoitharrault.ameixanonfree.utils;
import android.content.res.Resources;
import android.graphics.Bitmap;
......@@ -8,7 +8,7 @@ import android.graphics.drawable.Drawable;
import android.view.View;
import android.widget.ImageView;
import org.xphnx.ameixa.async.BitmapLoadTask;
import org.benoitharrault.ameixanonfree.async.BitmapLoadTask;
import androidx.core.graphics.drawable.DrawableCompat;
......
app/src/main/java/org/xphnx/ameixa/utils/ScreenUtils.java
+ 1
− 1
View file @ 4894a358
package org.xphnx.ameixa.utils;
package org.benoitharrault.ameixanonfree.utils;
import android.content.Context;
......
app/src/main/res/values-es/strings.xml
+ 1
− 2
View file @ 4894a358
......@@ -3,11 +3,10 @@
<string name="icons">Iconos</string>
<string name="sourcecodetext">Código Fuente</string>
<string name="licensetext">Licencia</string>
<string name="sourcecodelink">https://gitlab.com/xphnx/ameixa</string>
<string name="sourcecodelink">https://git.harrault.fr/android/ameixa-nonfree</string>
<string name="codelicense">El código fuente de este programa está disponible bajo la GNU General Public License v3.</string>
<string name="imageslicense">Las imágenes incluidas en este programa están disponibles bajo la licencia Creative Commons Attribution Share Alike 4.0, excepto para aquellos trabajos derivados que no sean compatibles con la misma (ver créditos).</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>
app/src/main/res/values/strings.xml
+ 3
− 3
View file @ 4894a358
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Ameixa</string>
<string name="app_name" translatable="false">Ameixa non-free</string>
<string name="icons">Icons</string>
<string name="sourcecodetext">Source Code</string>
<string name="licensetext">License</string>
<string name="sourcecodelink">https://gitlab.com/xphnx/ameixa</string>
<string name="sourcecodelink">https://git.harrault.fr/android/ameixa-nonfree</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>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment