Merge pull request #784 from Sereri/develop

3.9.9
Awful · Nov 10, 2024 · 06315ed · 06315ed
2 parents 6b6fc42 + b27c1f7
commit 06315ed
Show file tree

Hide file tree

Showing 77 changed files with 2,368 additions and 266 deletions.
diff --git a/Awful.apk/build.gradle b/Awful.apk/build.gradle
@@ -2,7 +2,7 @@ buildscript {
     ext.kotlin_version = '1.9.21'
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath 'com.android.tools.build:gradle:8.7.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,8 +25,8 @@ android {
     defaultConfig {
         applicationId = "com.ferg.awfulapp"
         minSdkVersion 24
-        targetSdkVersion 34
-        resConfigs 'en'
+        targetSdkVersion 35
+        resourceConfigurations += ['en']
 
         // Stops the Gradle plugin’s automatic rasterization of vectors
         vectorDrawables.useSupportLibrary = true
@@ -66,9 +66,9 @@ android {
             //proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
         }
     }
-
-    kotlin {
-        jvmToolchain(17)
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 
     task copyThreadTags {
@@ -105,8 +105,8 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
     // these are all needed to override some old versions that are dependencies... somewhere
     implementation 'androidx.media:media:1.7.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
@@ -116,9 +116,9 @@ dependencies {
     implementation 'com.android.volley:volley:1.2.1'
 
 
-    implementation 'com.google.code.gson:gson:2.10'
+    implementation 'com.google.code.gson:gson:2.11.0'
 
-    implementation 'org.jsoup:jsoup:1.15.4'
+    implementation 'org.jsoup:jsoup:1.18.1'
     implementation 'com.jakewharton.threetenabp:threetenabp:1.2.4'
     implementation 'com.samskivert:jmustache:1.15'
 
@@ -134,16 +134,12 @@ dependencies {
     implementation 'com.bignerdranch.android:expandablerecyclerview:2.1.1'
     implementation 'com.jakewharton.timber:timber:4.7.1'
 
-    implementation 'com.github.bumptech.glide:glide:4.16.0'
-    ksp 'com.github.bumptech.glide:ksp:4.16.0'
-
-    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
-
     implementation 'com.github.rubensousa:BottomSheetBuilder:1.5.1'
+    implementation 'androidx.preference:preference:1.2.1'
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.hamcrest:hamcrest-library:1.3'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
 
     // updating this might cause the status and navigation bar to become blue, test for this
     implementation 'androidx.core:core-splashscreen:1.0.0-alpha02'

diff --git a/Awful.apk/src/main/AndroidManifest.xml b/Awful.apk/src/main/AndroidManifest.xml
@@ -7,8 +7,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.ferg.awfulapp"
-    android:versionCode="30902"
-    android:versionName="3.9.2"
+    android:versionCode="30909"
+    android:versionName="3.9.9"
       android:installLocation="auto">
     <supports-screens
         android:smallScreens="true"
@@ -18,6 +18,7 @@
         />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
@@ -254,6 +255,11 @@
             android:windowSoftInputMode="adjustResize"
             android:configChanges="orientation|keyboardHidden|screenSize"
             />
+        <activity
+            android:name="com.ferg.awfulapp.PostThreadActivity"
+            android:windowSoftInputMode="adjustResize"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            />
 
         <activity android:name=".users.LepersColonyActivity"/>
 

diff --git a/Awful.apk/src/main/assets/changelog.html b/Awful.apk/src/main/assets/changelog.html
@@ -6,7 +6,17 @@
 
 <main>
     <section>
-        <h2>3.9.2</h2>
+        <h2>3.9.9</h2>
+        <ul>
+            <li>Replaced the display image zoom thing so that it doesn't just enlarge the image but also actually zooms in. The wonders of modern technology.</li>
+            <li>Added function to increase the number of bad threads on the forums. May dog have mercy on our souls.</li>
+            <li>Fixed file attachments again (Android 13 and up this time).</li>
+            <li>Fixed the theme font functionality. You can now make (most of) the app look like a 2009 Samsung phone again.</li>
+            <li>Added OpenDislexic font. Gee Whiz, what a coincidence.</li>
+        </ul>
+    </section>
+    <section>
+        <h2>3.9.4</h2>
         <ul>
             <li>Made imgur upload work again. You can finally uninstall that awful app. No, I mean theirs. I should have written terrible app, that's clearer.</li>
             <li>Removed crash report library because Google considers it collecting user data. Now collecting user data via the base functionality again like in 2012. Remember to include your username in the crash reports. Or don't, that's ok too.</li>

diff --git a/Awful.apk/src/main/assets/css/amberpos.css b/Awful.apk/src/main/assets/css/amberpos.css
@@ -80,4 +80,14 @@ body {
 */
 .postmenu:after {
     content: "\e901";
+}
+
+
+#zoom-close {
+    background: black;
+    border: 2px solid #eacf4c;
+}
+
+#zoom-close:after {
+    color: #eacf4c;
 }
diff --git a/Awful.apk/src/main/assets/css/general.css b/Awful.apk/src/main/assets/css/general.css
@@ -317,4 +317,53 @@ video.playing ~ .video-link {
 
 .postcontent .signature {
     padding-top: 10px;
+}
+
+#zoom {
+    display: none;
+}
+
+#zoom img {
+    display: block;
+    max-width:100%;
+    max-height:100%;
+    cursor: move;
+    touch-action: none;
+ }
+
+#zoom.zoom-enabled {
+    z-index: 1;
+    background-color: black;
+    position: fixed;
+    overflow: hidden;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+}
+
+#zoom-close {
+    position: fixed;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    top: 20px;
+    right: 20px;
+    background: #00000099;
+    width: 50px;
+    height: 50px;
+    z-index: 2;
+}
+
+#zoom-close:after {
+    display: block;
+    content: '\00d7';
+    font-size: 50px;
+    color: white;
 }
diff --git a/Awful.apk/src/main/assets/css/oled.css b/Awful.apk/src/main/assets/css/oled.css
@@ -97,4 +97,12 @@ body {
     height: 1px;
     background-color: #e7e7e7;
     margin: 0px;
+}
+
+#zoom-close {
+    background: black;
+}
+
+#zoom-close:after {
+    color: #e7e7e7;
 }
diff --git a/Awful.apk/src/main/assets/css/yospos.css b/Awful.apk/src/main/assets/css/yospos.css
@@ -83,4 +83,13 @@ body {
 */
 .postmenu:after {
     content: "\e901";
+}
+
+#zoom-close {
+    background: black;
+    border: 2px solid #0F0;
+}
+
+#zoom-close:after {
+    color: #0F0;
 }
diff --git a/Awful.apk/src/main/assets/fonts/open_dyslexic.ttf.mp3 b/Awful.apk/src/main/assets/fonts/open_dyslexic.ttf.mp3
diff --git a/Awful.apk/src/main/assets/javascript/hammer.js b/Awful.apk/src/main/assets/javascript/hammer.js