Move customtheme to xml+smali patch

.gitattributes

@@ -0,0 +1,2 @@
+* text=auto eol=lf
+

Dockerfile

@@ -0,0 +1,62 @@
+FROM ubuntu:21.04
+
+# Install needed packages
+RUN apt-get update
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python3 android-sdk-build-tools wget unzip imagemagick git patch software-properties-common
+
+# Install fdroid
+RUN add-apt-repository ppa:fdroid/fdroidserver
+RUN apt-get update
+RUN apt-get -y install fdroidserver
+
+# Create resources folder for tools/images etc
+ENV CTC_FOLDER=/opt/ctc
+RUN mkdir ${CTC_FOLDER}
+
+# Grab modified apktool
+RUN mkdir ${CTC_FOLDER}/tools
+RUN wget -O ${CTC_FOLDER}/tools/apktool.jar https://f001.backblazeb2.com/file/avepub/apktool-cli-all.jar
+
+# Grab xml-patch (https://github.com/dnault/xml-patch)
+RUN wget -O ${CTC_FOLDER}/tools/xml-patch.jar https://jcenter.bintray.com/com/github/dnault/xml-patch/0.3.1/xml-patch-0.3.1.jar
+
+# Grab emoji sets
+ENV EMOJI_PATH=${CTC_FOLDER}/emojis
+ENV EMOJI_MUTANT_PATH=${EMOJI_PATH}/mutant
+ENV EMOJI_BLOBMOJIS_PATH=${EMOJI_PATH}/blobmojis
+RUN mkdir ${EMOJI_PATH}
+
+# Mutant emojis
+RUN mkdir ${EMOJI_MUTANT_PATH}
+WORKDIR ${EMOJI_MUTANT_PATH}
+RUN wget https://mutant.lavatech.top/72x72.zip
+RUN unzip 72x72.zip
+RUN mv 72x72/*.png .
+RUN rm -rf 72x72
+RUN rm 72x72.zip
+
+# Blobmojis
+RUN mkdir ${EMOJI_BLOBMOJIS_PATH}
+RUN mkdir /tmp/blobmoji
+WORKDIR /tmp/blobmoji
+RUN wget https://github.com/C1710/blobmoji/archive/refs/heads/main.zip
+RUN 7za x main.zip
+WORKDIR /tmp/blobmoji/blobmoji-main/svg
+RUN find ./*.svg -exec mogrify -format png -resize 72x72 -path ${EMOJI_BLOBMOJIS_PATH} {} \; ; exit 0
+
+# Generate self signed KS
+RUN mkdir ${CTC_FOLDER}/keystores
+WORKDIR ${CTC_FOLDER}/keystores
+RUN keytool -genkey -alias test \
+    -keyalg RSA -keystore keystore.jks \
+    -dname "CN=Test, OU=Test, O=Test, L=Test, S=Test, C=Test" \
+    -storepass password -keypass password
+
+# Make folder for git repo
+RUN mkdir ${CTC_FOLDER}/gitrepo
+WORKDIR ${CTC_FOLDER}/gitrepo
+
+# paths in ctcconfig in docker
+# container							fs
+# /opt/ctc/gitrepo					
+# /opt/ctc/keystores/keystore.jks	not specified by default

ctcci/ctcconfig.example.py

@@ -1,79 +0,0 @@
-import os
-
-APKTOOL_BIN = "java -jar /home/ave/apktool-cli-all.jar"  # use latest
-
-# APKs must be placed under $DISTOK_FOLDER/android/$PACKAGE_ID-$VERSION_NUMBER.apk
-# Example: /home/ave/distok/android/com.discord-909.apk
-DISTOK_FOLDER = "/home/ave/distok"
-
-# Set if F-Droid repo should be automatically updated or not
-# If set to False, you can leave FDROID_FOLDER empty
-DO_FDROID = True
-FDROID_FOLDER = "/var/www/fdroid/seabear"
-
-# This is where APKs will be placed
-RESULT_FOLDER = FDROID_FOLDER + "/repo"
-
-# Repo for CutTheCord (https://gitdab.com/distok/cutthecord)
-DO_GITPULL = True
-REPO_FOLDER = "/home/ave/distokrepos/cutthecord"
-
-# If false, jarsigner will be used for signing the apk.
-DO_APKSIGNER = True
-
-# Keystore file, alias and pass. Required.
-KEYSTORE_FILE = "/home/ave/oof.keystore"
-KEYSTORE_ALIAS = "distok"
-KEYSTORE_PASS = "redacted"
-
-# Set this to the python version you want to use. Needs to be 3.6+.
-PYTHON_BIN = "python3.6"
-
-# Folder where the apk will be extracted to, patched in, and packed back on
-# You're not recommended to touch WORK_APK_PATH.
-WORK_FOLDER = "/tmp/cutthecord"
-WORK_APK_PATH = os.path.join(WORK_FOLDER, "discord")
-
-# Package ID for discord. You should probably not touch this.
-PACKAGE_ID = "com.discord"
-
-# Set to force if you want builds to be done
-# even if there's already a build for this version
-FORCE = False
-
-# Custom ringtones, default = applied to all the ones not explicitly stated
-RINGTONES = {"ave": "/home/ave/sans.mp3",
-             "default": "/home/ave/removeskype.mp3"}
-
-# Custom icons, default = applied to all the ones not explicitly stated
-ICONS = {"ave": "/home/ave/ctclogoave.png",
-         "default": "/home/ave/ctclogo.png"}
-
-# Custom dynamic icons, default = applied to all the ones not explicitly stated
-DYN_ICONS = {"ave": {"bg": "/home/ave/distokrepos/cutthecord/icons/bg.png",
-                     "fg": "/home/ave/distokrepos/cutthecord/icons/fg.png"},
-             "default": {"bg": "/home/ave/dcbg.png",
-                         "fg": "/home/ave/dcfg.png"}}
-
-# Custom app names, default = applied to all the ones not explicitly stated
-# Needs to be one word, __ gets replaced with space
-APP_NAMES = {"ave": "CutTheCord__Ave",
-             "litecord": "Litecord",
-             "test": "CTC__Testing",
-             "default": "CutTheCord"}
-
-# Custom fonts, default = applied to all the ones not explicitly stated
-FONTS = {"ellie": {"whitney_bold.ttf": "/home/ave/fonts/GoogleSans-Bold.ttf",
-                   "whitney_semibold.ttf": "/home/ave/fonts/GoogleSans-Medium.ttf",
-                   "whitney_medium.ttf": "/home/ave/fonts/GoogleSans-Regular.ttf"},
-        "dyslexic": {"whitney_bold.ttf": "/home/ave/fonts/OpenDyslexic3-Bold.ttf",
-                   "whitney_semibold.ttf": "/home/ave/fonts/OpenDyslexic3-Bold.ttf",
-                   "whitney_medium.ttf": "/home/ave/fonts/OpenDyslexic3-Regular.ttf"},
-        "murm": {"whitney_bold.ttf": "/home/ave/fonts/comicbd.ttf",
-                 "whitney_semibold.ttf": "/home/ave/fonts/comicbd.ttf",
-                 "whitney_medium.ttf": "/home/ave/fonts/comic.ttf"},
-        "ave": {"sourcecodepro_semibold.ttf": "/home/ave/fonts/comic.ttf"},
-        "default": {}}
-
-# Amount of last builds cleanartifacts.py should keep
-CLEAN_ARTIFACT_KEEP_COUNT = 2

resources/distok/android/.gitignore

@@ -0,0 +1,2 @@
+*.apk
+

resources/old-patches/README.md

@@ -11,3 +11,6 @@ Here's why these patches are no longer maintained in this form:
 - customdefaultemoji: There doesn't seem to be default emojis anymore?
 - noprofilestrip: UI changes removed the profile strip.
 - nonearby: Didn't add much anyways.
+- squareavatars: Moved to xml-patchs
+- betterrotation: Moved to xml-patchs
+- noblocked: Moved to xml-patchs