diff --git a/.gitignore b/.gitignore index 7d258a2..788c02a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,52 +1,3 @@ -.gradle build/ -!gradle/wrapper/gradle-wrapper.jar -!**/src/main/**/build/ -!**/src/test/**/build/ - - - -## ykit - source-apk/*.apk -tools/* -# Temporary - - - -### IntelliJ IDEA ### -.idea/modules.xml -.idea/jarRepositories.xml -.idea/compiler.xml -.idea/libraries/ -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### Eclipse ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ - -### Mac OS ### -.DS_Store \ No newline at end of file +tools/* \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index eaf91e2..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 1fca253..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 4b9df76..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 9661ac7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 606681c..0000000 --- a/build.gradle +++ /dev/null @@ -1,97 +0,0 @@ -plugins { - id 'java' -} - -group = 'dev.maelstrom' -version = '0.3-SNAPSHOT' - -repositories { - mavenCentral() -} - -dependencies { - testImplementation platform('org.junit:junit-bom:5.10.0') - testImplementation 'org.junit.jupiter:junit-jupiter' -} - -test { - useJUnitPlatform() -} - -tasks.register('extractApk', JavaExec) { - onlyIf { - !file('build/extracted').exists() - } - - classpath = files('tools/apktool_2.9.3.jar') - - args = ['d', 'source-apk/tumblr.apk', '-o', 'build/extracted'] -} - -tasks.register('mergeSmali') { - dependsOn tasks.extractApk - doLast { - copy { - into 'build/smali-merged' - from('src/main/smali') - from('build/extracted') { - include 'smali_classes*/**', 'smali/**' - } - - duplicatesStrategy 'exclude' - } - } -} - -tasks.register('smali') { - dependsOn tasks.mergeSmali - doLast { - mkdir('build/dex') - javaexec { - classpath = file('tools/smali-2.5.2.jar') - println(classpath.files) - - args = ['a', 'build/smali-merged/smali', '-o', 'build/dex/classes.dex'] - } - } -} - -// NOTE: Maybe broken if gradle thinks the extracted files are newer? -tasks.register('mergeResources') { - dependsOn tasks.extractApk - dependsOn tasks.smali - doLast { -// copy { // Copy from extracted -// from 'build/extracted' -// into 'build/merged' -// //exclude 'smali_classes*', 'smali' -// } -// copy { // Copy resources from src -// from 'src/main/resources' -// into 'build/merged' -// } -// copy { // Copy smali from src -// from 'src/main/smali' -// into 'build/merged' -// } - copy { - into('build/merged') - - from('build/extracted') { - exclude 'smali_classes*', 'smali' - } - from('build/dex') - from('src/main/resources') - - duplicatesStrategy 'include' - } - } -} - -tasks.register('buildApk', JavaExec) { - dependsOn mergeResources - - classpath = files('tools/apktool_2.9.3.jar') - - args = ['b', 'build/merged', '-o', 'build/merged-apktool/tumblr-ykit.apk'] -} \ No newline at end of file diff --git a/build.py b/build.py new file mode 100644 index 0000000..9916301 --- /dev/null +++ b/build.py @@ -0,0 +1,113 @@ +import sys +import shutil +import os +from pathlib import Path +import subprocess + +class BuildError(Exception): + def __init__(self): + super.__init__() + +def getDexName(smaliName): + if smaliName == 'smali': + return 'classes.dex' + elif smaliName.startswith('smali_classes'): + return 'classes' + smaliName[13:] + '.dex' + print("Not a smali name") + raise BuildError() + +class Task: + def clean(): + shutil.rmtree('build') + + def extractApk(): + if Path('build/extracted').exists(): + return + Path('build').mkdir(parents=True, exist_ok=True) + + apk = list(filter(lambda f: f.endswith('.apk'), os.listdir('source-apk'))) + if len(apk) == 0: + print('Please place the APK inside the source-apk directory.') + raise BuildError() + elif len(apk) > 1: + print('More than one apk found in source-apk. Please remove all but one.') + raise BuildError() + + # Extract the apk + print("Extracting APK...") + subprocess.run(['java', '-jar', './tools/apktool_2.9.3.jar', 'd', 'source-apk/' + apk[0], '-o', 'build/extracted']) + + def copySmali(): + Task.extractApk() + + Path('build/smali').mkdir(parents=True, exist_ok=True) + # Copy smali classes that haven't been yet + for file in os.listdir('build/extracted'): + if file != 'smali' and not file.startswith('smali_classes'): + continue + + # Skip if already exists + if Path(f'build/smali/{file}').exists(): + continue + + print(f'Copying {file}...') + shutil.copytree(f'build/extracted/{file}', f'build/smali/{file}') + + # Copy from src + print('Copying ykit smali...') + shutil.copytree('src/smali', 'build/smali', dirs_exist_ok=True) + + def compileSmali(): + Task.copySmali() + + Path('build/dex').mkdir(parents=True, exist_ok=True) + + def shouldCompileSmali(file, dex): + src = f'build/smali/{file}' + ykitsrc = f'src/smali/{file}' + dst = f'build/dex/{dex}' + + # If dest doesn't exist, always build + if not Path(dst).exists(): + return True + + # Check if ykit src dir exists for it, if not then don't recompile + if not Path(ykitsrc).exists(): + return False + + # Get latest file timestamp in ykitsrc + files = list(Path(ykitsrc).rglob('*.smali')) + files = [os.path.getmtime(x) for x in files] + latest = max(files) + + dsttime = os.path.getmtime(dst) + + # If it is newer than the dest, then do recompile + if latest > dsttime: + return True + + # Otherwise, don't + return False + + for file in os.listdir('build/smali'): + dex = getDexName(file) + + if not shouldCompileSmali(file, dex): + print(f"Skipping {file}...") + continue + + print(f"Compiling {file}...") + subprocess.run(['java', '-jar', 'tools/smali-2.5.2.jar', 'a', f'build/smali/{file}', '-o', f'build/dex/{dex}']) + +def main(): + + match sys.argv[1]: + case 'clean': + Task.clean() + case 'extract': + Task.extractApk() + case 'build': + Task.compileSmali() + +if __name__ == '__main__': + main() \ No newline at end of file diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..7215a8d --- /dev/null +++ b/build.sh @@ -0,0 +1 @@ +python build.py "$@" \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 249e583..0000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index a627dae..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Fri Jul 19 13:19:31 CEST 2024 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew deleted file mode 100644 index 1b6c787..0000000 --- a/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index ac1b06f..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@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 Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@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="-Xmx64m" "-Xms64m" - -@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 execute - -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 execute - -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 - -: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 %* - -: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 diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index e8a5240..0000000 --- a/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'ykit' - diff --git a/src/main/resources/AndroidManifest.xml b/src/resources/AndroidManifest.xml similarity index 100% rename from src/main/resources/AndroidManifest.xml rename to src/resources/AndroidManifest.xml diff --git a/src/main/resources/res/drawable/oval_yellow.xml b/src/resources/res/drawable/oval_yellow.xml similarity index 100% rename from src/main/resources/res/drawable/oval_yellow.xml rename to src/resources/res/drawable/oval_yellow.xml diff --git a/src/main/resources/res/drawable/ykitty.xml b/src/resources/res/drawable/ykitty.xml similarity index 100% rename from src/main/resources/res/drawable/ykitty.xml rename to src/resources/res/drawable/ykitty.xml diff --git a/src/main/resources/res/layout/activity_ykit_settings.xml b/src/resources/res/layout/activity_ykit_settings.xml similarity index 100% rename from src/main/resources/res/layout/activity_ykit_settings.xml rename to src/resources/res/layout/activity_ykit_settings.xml diff --git a/src/main/resources/res/layout/color_options_toolbar.xml b/src/resources/res/layout/color_options_toolbar.xml similarity index 100% rename from src/main/resources/res/layout/color_options_toolbar.xml rename to src/resources/res/layout/color_options_toolbar.xml diff --git a/src/main/resources/res/layout/fragment_blog_settings.xml b/src/resources/res/layout/fragment_blog_settings.xml similarity index 100% rename from src/main/resources/res/layout/fragment_blog_settings.xml rename to src/resources/res/layout/fragment_blog_settings.xml diff --git a/src/main/resources/res/public/public.xml b/src/resources/res/public/public.xml similarity index 100% rename from src/main/resources/res/public/public.xml rename to src/resources/res/public/public.xml diff --git a/src/main/resources/res/raw/ykit_meow.m4a b/src/resources/res/raw/ykit_meow.m4a similarity index 100% rename from src/main/resources/res/raw/ykit_meow.m4a rename to src/resources/res/raw/ykit_meow.m4a diff --git a/src/main/resources/res/values/public.xml b/src/resources/res/values/public.xml similarity index 100% rename from src/main/resources/res/values/public.xml rename to src/resources/res/values/public.xml diff --git a/src/main/smali/smali_classes2/com/tumblr/ui/fragment/BlogSettingsFragment.smali b/src/smali/smali_classes2/com/tumblr/ui/fragment/BlogSettingsFragment.smali similarity index 100% rename from src/main/smali/smali_classes2/com/tumblr/ui/fragment/BlogSettingsFragment.smali rename to src/smali/smali_classes2/com/tumblr/ui/fragment/BlogSettingsFragment.smali diff --git a/src/main/smali/smali_classes2/ee0/l2.smali b/src/smali/smali_classes2/ee0/l2.smali similarity index 100% rename from src/main/smali/smali_classes2/ee0/l2.smali rename to src/smali/smali_classes2/ee0/l2.smali diff --git a/src/main/smali/smali_classes2/sd0/m.smali b/src/smali/smali_classes2/sd0/m.smali similarity index 100% rename from src/main/smali/smali_classes2/sd0/m.smali rename to src/smali/smali_classes2/sd0/m.smali diff --git a/src/main/smali/smali_classes3/com/tumblr/rumblr/model/post/PostJsonAdapter.smali b/src/smali/smali_classes3/com/tumblr/rumblr/model/post/PostJsonAdapter.smali similarity index 100% rename from src/main/smali/smali_classes3/com/tumblr/rumblr/model/post/PostJsonAdapter.smali rename to src/smali/smali_classes3/com/tumblr/rumblr/model/post/PostJsonAdapter.smali diff --git a/src/main/smali/smali_classes3/com/tumblr/rumblr/moshi/TimelineObjectAdapterFactory$TimelineObjectJsonAdapter.smali b/src/smali/smali_classes3/com/tumblr/rumblr/moshi/TimelineObjectAdapterFactory$TimelineObjectJsonAdapter.smali similarity index 100% rename from src/main/smali/smali_classes3/com/tumblr/rumblr/moshi/TimelineObjectAdapterFactory$TimelineObjectJsonAdapter.smali rename to src/smali/smali_classes3/com/tumblr/rumblr/moshi/TimelineObjectAdapterFactory$TimelineObjectJsonAdapter.smali diff --git a/src/main/smali/smali_classes3/hw/e$b.smali b/src/smali/smali_classes3/hw/e$b.smali similarity index 100% rename from src/main/smali/smali_classes3/hw/e$b.smali rename to src/smali/smali_classes3/hw/e$b.smali diff --git a/src/main/smali/smali_classes3/oa0/j.smali b/src/smali/smali_classes3/oa0/j.smali similarity index 100% rename from src/main/smali/smali_classes3/oa0/j.smali rename to src/smali/smali_classes3/oa0/j.smali diff --git a/src/main/smali/smali_classes5/com/tumblr/posts/postform/view/ColorOptionsToolBar.smali b/src/smali/smali_classes5/com/tumblr/posts/postform/view/ColorOptionsToolBar.smali similarity index 100% rename from src/main/smali/smali_classes5/com/tumblr/posts/postform/view/ColorOptionsToolBar.smali rename to src/smali/smali_classes5/com/tumblr/posts/postform/view/ColorOptionsToolBar.smali diff --git a/src/main/smali/smali_classes5/ix/f$n.smali b/src/smali/smali_classes5/ix/f$n.smali similarity index 100% rename from src/main/smali/smali_classes5/ix/f$n.smali rename to src/smali/smali_classes5/ix/f$n.smali diff --git a/src/main/smali/smali_classes6/dev/maelstrom/ykit/CoreAppShim.smali b/src/smali/smali_classes6/dev/maelstrom/ykit/CoreAppShim.smali similarity index 100% rename from src/main/smali/smali_classes6/dev/maelstrom/ykit/CoreAppShim.smali rename to src/smali/smali_classes6/dev/maelstrom/ykit/CoreAppShim.smali diff --git a/src/main/smali/smali_classes6/dev/maelstrom/ykit/DashboardDeclutterShim.smali b/src/smali/smali_classes6/dev/maelstrom/ykit/DashboardDeclutterShim.smali similarity index 100% rename from src/main/smali/smali_classes6/dev/maelstrom/ykit/DashboardDeclutterShim.smali rename to src/smali/smali_classes6/dev/maelstrom/ykit/DashboardDeclutterShim.smali diff --git a/src/main/smali/smali_classes6/dev/maelstrom/ykit/FeatureOverride.smali b/src/smali/smali_classes6/dev/maelstrom/ykit/FeatureOverride.smali similarity index 100% rename from src/main/smali/smali_classes6/dev/maelstrom/ykit/FeatureOverride.smali rename to src/smali/smali_classes6/dev/maelstrom/ykit/FeatureOverride.smali diff --git a/src/main/smali/smali_classes6/dev/maelstrom/ykit/PhoebeCallback.smali b/src/smali/smali_classes6/dev/maelstrom/ykit/PhoebeCallback.smali similarity index 100% rename from src/main/smali/smali_classes6/dev/maelstrom/ykit/PhoebeCallback.smali rename to src/smali/smali_classes6/dev/maelstrom/ykit/PhoebeCallback.smali diff --git a/src/main/smali/smali_classes6/dev/maelstrom/ykit/PostJsonAdapterShim$BlogChangedListener$Thread.smali b/src/smali/smali_classes6/dev/maelstrom/ykit/PostJsonAdapterShim$BlogChangedListener$Thread.smali similarity index 100% rename from src/main/smali/smali_classes6/dev/maelstrom/ykit/PostJsonAdapterShim$BlogChangedListener$Thread.smali rename to src/smali/smali_classes6/dev/maelstrom/ykit/PostJsonAdapterShim$BlogChangedListener$Thread.smali diff --git a/src/main/smali/smali_classes6/dev/maelstrom/ykit/PostJsonAdapterShim$BlogChangedListener.smali b/src/smali/smali_classes6/dev/maelstrom/ykit/PostJsonAdapterShim$BlogChangedListener.smali similarity index 100% rename from src/main/smali/smali_classes6/dev/maelstrom/ykit/PostJsonAdapterShim$BlogChangedListener.smali rename to src/smali/smali_classes6/dev/maelstrom/ykit/PostJsonAdapterShim$BlogChangedListener.smali diff --git a/src/main/smali/smali_classes6/dev/maelstrom/ykit/PostJsonAdapterShim.smali b/src/smali/smali_classes6/dev/maelstrom/ykit/PostJsonAdapterShim.smali similarity index 100% rename from src/main/smali/smali_classes6/dev/maelstrom/ykit/PostJsonAdapterShim.smali rename to src/smali/smali_classes6/dev/maelstrom/ykit/PostJsonAdapterShim.smali diff --git a/src/main/smali/smali_classes6/dev/maelstrom/ykit/enhancedblock/EnhancedBlockFilter.smali b/src/smali/smali_classes6/dev/maelstrom/ykit/enhancedblock/EnhancedBlockFilter.smali similarity index 100% rename from src/main/smali/smali_classes6/dev/maelstrom/ykit/enhancedblock/EnhancedBlockFilter.smali rename to src/smali/smali_classes6/dev/maelstrom/ykit/enhancedblock/EnhancedBlockFilter.smali diff --git a/src/main/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitCurrentSettings.smali b/src/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitCurrentSettings.smali similarity index 100% rename from src/main/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitCurrentSettings.smali rename to src/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitCurrentSettings.smali diff --git a/src/main/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsActivity$UpdateSetting2.smali b/src/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsActivity$UpdateSetting2.smali similarity index 100% rename from src/main/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsActivity$UpdateSetting2.smali rename to src/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsActivity$UpdateSetting2.smali diff --git a/src/main/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsActivity$toggleHelper.smali b/src/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsActivity$toggleHelper.smali similarity index 100% rename from src/main/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsActivity$toggleHelper.smali rename to src/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsActivity$toggleHelper.smali diff --git a/src/main/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsActivity.smali b/src/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsActivity.smali similarity index 100% rename from src/main/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsActivity.smali rename to src/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsActivity.smali diff --git a/src/main/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsClickListener.smali b/src/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsClickListener.smali similarity index 100% rename from src/main/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsClickListener.smali rename to src/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsClickListener.smali diff --git a/src/main/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsToggle.smali b/src/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsToggle.smali similarity index 100% rename from src/main/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsToggle.smali rename to src/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsToggle.smali diff --git a/src/main/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsVersionButton$LongClickListener.smali b/src/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsVersionButton$LongClickListener.smali similarity index 100% rename from src/main/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsVersionButton$LongClickListener.smali rename to src/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsVersionButton$LongClickListener.smali diff --git a/src/main/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsVersionButton.smali b/src/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsVersionButton.smali similarity index 100% rename from src/main/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsVersionButton.smali rename to src/smali/smali_classes6/dev/maelstrom/ykit/settings/YkitSettingsVersionButton.smali