diff --git a/app/build.gradle b/app/build.gradle index 0ec8d5b209330c6d6231b682ebcd58e61499cfa9..6b86adeb0159d7abfc54ab547f9b2699a6548fce 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "org.benoitharrault.ameixanonfree" minSdkVersion 16 targetSdkVersion 30 - versionCode 83 - versionName "1.34.0" + versionCode 84 + versionName "1.34.1" archivesBaseName = "$applicationId" + "_" + "$versionCode" } diff --git a/app/src/main/res/xml/appfilter.xml b/app/src/main/res/xml/appfilter.xml index 82ba866a14ddd2f28d87f1ae16b080bad8688e5e..49bbb519e21d15d0d66c5e0b9499fa23d3fa9e5c 100644 --- a/app/src/main/res/xml/appfilter.xml +++ b/app/src/main/res/xml/appfilter.xml @@ -7345,13 +7345,13 @@ component="ComponentInfo{eu.kanade.tachiyomi.debug/eu.kanade.tachiyomi.ui.main.MainActivity}" drawable="tachiyomi" /> <item - component="ComponentInfo{tachiyomi.mangadex/eu.kanade.tachiyomi.ui.main.MainActivity" + component="ComponentInfo{tachiyomi.mangadex/eu.kanade.tachiyomi.ui.main.MainActivity}" drawable="tachiyomi" /> <item component="ComponentInfo{eu.kanade.tachiyomi.j2k/eu.kanade.tachiyomi.ui.main.MainActivity}" drawable="tachiyomi" /> <item - component="ComponentInfo{eu.kanade.tachiyomi.sy/eu.kanade.tachiyomi.ui.main.MainActivity" + component="ComponentInfo{eu.kanade.tachiyomi.sy/eu.kanade.tachiyomi.ui.main.MainActivity}" drawable="tachiyomi" /> <item component="ComponentInfo{com.madlonkay.orgro/com.madlonkay.orgro.MainActivity}" diff --git a/check_icons.sh b/check_icons.sh index ea0b5872497fa7a8b0543357f5a0a98e94fc8a8c..0691e9b9ce76c96b30f59d2177eaa4845b1fa111 100755 --- a/check_icons.sh +++ b/check_icons.sh @@ -10,10 +10,25 @@ ICON_SIZES="drawable-mdpi drawable-hdpi drawable-xhdpi drawable-xxhdpi drawable- DEFAULT_ICON_TYPE=$(echo "${ICON_TYPES}" | cut -d" " -f1) -CHECK_COUNT="11" +CHECK_COUNT="13" return_value=0 -echo "(1/${CHECK_COUNT}) Checking \"each application component name is unique in ${DEFINITION_FILE}\"..." + +echo "(1/${CHECK_COUNT}) Checking \"only template colors are used\"..." +TEMPLATE_COLORS="$(grep -h -o '#[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]' ./other/templates/*.svg | tr [:lower:] [:upper:] | sort | uniq)" +for SVG in $(find ${TODO_FOLDER} -name '*.svg' | tr '\n' ' ') +do + USED_COLORS="$(grep -h -o '#[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]' $SVG | sort | uniq)" + JOINT_COLORS="$(echo $TEMPLATE_COLORS $USED_COLORS | tr [:lower:] [:upper:] | tr ' ' '\n' | sort | uniq)" + if [[ "$TEMPLATE_COLORS" != "$JOINT_COLORS" ]]; then + echo "File icon has not allowed color: $SVG" + diff <(echo "$TEMPLATE_COLORS") <(echo "$JOINT_COLORS") + return_value=$((return_value + 1)) + fi +done +echo "ok, done" + +echo "(2/${CHECK_COUNT}) Checking \"each application component name is unique in ${DEFINITION_FILE}\"..." DUPLICATES=$(grep "component=" ${DEFINITION_FILE} | sort | uniq --count --repeated) DUPLICATES_COUNT=$(echo "${DUPLICATES}" | sed '/^$/d' | wc -l | awk '{print $0}') if [[ $DUPLICATES_COUNT -ne 0 ]] @@ -24,7 +39,24 @@ then fi echo "ok, done" -echo "(2/${CHECK_COUNT}) Checking \"each icon definition in ${DEFINITION_FILE} has an existing svg icon file for each type\"..." +echo "(3/${CHECK_COUNT}) Checking \"consistant formatting ${DEFINITION_FILE}\"..." + +WRONGINDENT_ITEM=$(grep -nE "<item" ${DEFINITION_FILE} | grep -vE "^*: <item$") +WRONGINDENT_COMPONENT=$(grep -nE "component=" ${DEFINITION_FILE} | grep -vE "^*: component=\"ComponentInfo\{.*\}\"$" | grep -vE "component=\":") +WRONGINDENT_DRAWABLE=$(grep -nE "drawable=" ${DEFINITION_FILE} | grep -vE "^*: drawable=\".*\" />$") +WRONGINDENT_ITEM_COUNT=$(echo "${WRONGINDENT_ITEM}" | sed '/^$/d' | wc -l) +WRONGINDENT_COMPONENT_COUNT=$(echo "${WRONGINDENT_COMPONENT}" | sed '/^$/d' | wc -l) +WRONGINDENT_DRAWABLE_COUNT=$(echo "${WRONGINDENT_DRAWABLE}" | sed '/^$/d' | wc -l) +WRONGINDENT_COUNT=$((WRONGINDENT_ITEM_COUNT + WRONGINDENT_COMPONENT_COUNT + WRONGINDENT_DRAWABLE_COUNT)) +if [[ $WRONGINDENT_COUNT -ne 0 ]] +then + echo "Found wrong indent in ${DEFINITION_FILE}" + echo -e "${WRONGINDENT_ITEM}\n${WRONGINDENT_COMPONENT}\n${WRONGINDENT_DRAWABLE}" + return_value=$((return_value + ${WRONGINDENT_COUNT})) +fi +echo "ok, done" + +echo "(4/${CHECK_COUNT}) Checking \"each icon definition in ${DEFINITION_FILE} has an existing svg icon file for each type\"..." ICON_DEFINITIONS=$(sed 's/ /\n/g' ${DEFINITION_FILE} | grep "drawable" | cut -d"\"" -f2 | sort | uniq) for ICON in ${ICON_DEFINITIONS} do @@ -44,7 +76,7 @@ do done echo "ok, done" -echo "(3/${CHECK_COUNT}) Checking \"each icon definition in ${DRAWABLE_FILE} has an existing svg icon file for each type\"..." +echo "(5/${CHECK_COUNT}) Checking \"each icon definition in ${DRAWABLE_FILE} has an existing svg icon file for each type\"..." ICON_DRAWABLE=$(sed 's/ /\n/g' ${DRAWABLE_FILE} | grep "drawable" | cut -d"\"" -f2 | sort | uniq) for ICON in ${ICON_DRAWABLE} do @@ -64,7 +96,7 @@ do done echo "ok, done" -echo "(4/${CHECK_COUNT}) Checking \"each icon definition in ${ICONPACK_FILE} has an existing svg icon file for each type\"..." +echo "(6/${CHECK_COUNT}) Checking \"each icon definition in ${ICONPACK_FILE} has an existing svg icon file for each type\"..." ICON_ICONPACK=$(sed 's/ /\n/g' ${ICONPACK_FILE} | grep "item" | cut -d">" -f2 | cut -d"<" -f1 | sort | uniq) for ICON in ${ICON_ICONPACK} do @@ -84,7 +116,7 @@ do done echo "ok, done" -echo "(5/${CHECK_COUNT}) Checking \"each svg icon file exists in each icon type\"..." +echo "(7/${CHECK_COUNT}) Checking \"each svg icon file exists in each icon type\"..." for TYPE1 in ${ICON_TYPES} do for TYPE2 in ${ICON_TYPES} @@ -105,7 +137,7 @@ do done echo "ok, done" -echo "(6/${CHECK_COUNT}) Checking \"each svg icon file has at least one icon definition in ${DEFINITION_FILE}\"..." +echo "(8/${CHECK_COUNT}) Checking \"each svg icon file has at least one icon definition in ${DEFINITION_FILE}\"..." for SVG in ${SVG_BASE_FOLDER}/${DEFAULT_ICON_TYPE}/*.svg do ICON_NAME=$(basename ${SVG} .svg) @@ -119,7 +151,7 @@ do done echo "ok, done" -echo "(7/${CHECK_COUNT}) Checking \"each svg icon file has at least one icon definition in ${DRAWABLE_FILE}\"..." +echo "(9/${CHECK_COUNT}) Checking \"each svg icon file has at least one icon definition in ${DRAWABLE_FILE}\"..." for SVG in ${SVG_BASE_FOLDER}/${DEFAULT_ICON_TYPE}/*.svg do ICON_NAME=$(basename ${SVG} .svg) @@ -133,7 +165,7 @@ do done echo "ok, done" -echo "(8/${CHECK_COUNT}) Checking \"each svg icon file has at least one icon definition in ${ICONPACK_FILE}\"..." +echo "(10/${CHECK_COUNT}) Checking \"each svg icon file has at least one icon definition in ${ICONPACK_FILE}\"..." for SVG in ${SVG_BASE_FOLDER}/${DEFAULT_ICON_TYPE}/*.svg do ICON_NAME=$(basename ${SVG} .svg) @@ -147,7 +179,7 @@ do done echo "ok, done" -echo "(9/${CHECK_COUNT}) Checking \"each svg file has a png rendered file in each type/size\"..." +echo "(11/${CHECK_COUNT}) Checking \"each svg file has a png rendered file in each type/size\"..." for SVG in ${SVG_BASE_FOLDER}/${DEFAULT_ICON_TYPE}/*.svg do ICON_NAME=$(basename ${SVG} .svg) @@ -166,7 +198,7 @@ do done echo "ok, done" -echo "(10/${CHECK_COUNT}) Checking \"each generated png icon file is referenced in ${DEFINITION_FILE}\"..." +echo "(12/${CHECK_COUNT}) Checking \"each generated png icon file is referenced in ${DEFINITION_FILE}\"..." for TYPE in ${ICON_TYPES} do for SIZE in ${ICON_SIZES} @@ -186,7 +218,7 @@ do done echo "ok, done" -echo "(11/${CHECK_COUNT}) Checking \"each monochrome png file is really monochrome\"..." +echo "(13/${CHECK_COUNT}) Checking \"each monochrome png file is really monochrome\"..." PNG_MONOCHROMATIC_BASE_FOLDER="app/src/monochromatic/res/drawable-xxxhdpi" for PNG in ${PNG_MONOCHROMATIC_BASE_FOLDER}/*.png do