diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4f56a2f8..beb4a316 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,7 +27,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:localeConfig="@xml/locales_config"
- android:theme="@style/AppTheme">
+ android:theme="@style/BaseAppTheme">
+ android:theme="@style/BaseAppTheme.NoActionBar" />
+ android:theme="@style/BaseAppTheme.NoActionBar">
@@ -125,7 +125,7 @@
android:name=".LoginActivity"
android:exported="true"
android:screenOrientation="sensorPortrait"
- android:theme="@style/AppTheme.NoActionBar"
+ android:theme="@style/BaseAppTheme.NoActionBar"
android:windowSoftInputMode="adjustResize"
tools:ignore="LockedOrientationActivity">
diff --git a/app/src/main/java/org/pixeldroid/app/MainActivity.kt b/app/src/main/java/org/pixeldroid/app/MainActivity.kt
index 46e24a35..70467d77 100644
--- a/app/src/main/java/org/pixeldroid/app/MainActivity.kt
+++ b/app/src/main/java/org/pixeldroid/app/MainActivity.kt
@@ -78,7 +78,9 @@ class MainActivity : BaseThemedWithoutBarActivity() {
@OptIn(ExperimentalPagingApi::class)
override fun onCreate(savedInstanceState: Bundle?) {
- installSplashScreen()
+ installSplashScreen().setOnExitAnimationListener {
+ it.remove()
+ }
// Workaround for dynamic colors not applying due to splash screen?
DynamicColors.applyToActivityIfAvailable(this)
diff --git a/app/src/main/java/org/pixeldroid/app/posts/AlbumActivity.kt b/app/src/main/java/org/pixeldroid/app/posts/AlbumActivity.kt
index b40dfbdb..07456188 100644
--- a/app/src/main/java/org/pixeldroid/app/posts/AlbumActivity.kt
+++ b/app/src/main/java/org/pixeldroid/app/posts/AlbumActivity.kt
@@ -2,7 +2,6 @@ package org.pixeldroid.app.posts
import android.os.Bundle
import android.view.View
-import androidx.core.content.ContextCompat
import org.pixeldroid.app.databinding.ActivityAlbumBinding
import org.pixeldroid.app.utils.BaseActivity
import org.pixeldroid.app.utils.api.objects.Attachment
@@ -33,11 +32,8 @@ class AlbumActivity : BaseActivity() {
binding.postIndicator.visibility = View.GONE
}
-
-
supportActionBar?.setDisplayHomeAsUpEnabled(true)
supportActionBar?.setDisplayShowTitleEnabled(false)
supportActionBar?.setBackgroundDrawable(null)
- window.statusBarColor = ContextCompat.getColor(this,android.R.color.transparent)
}
}
\ No newline at end of file
diff --git a/app/src/main/java/org/pixeldroid/app/posts/StatusViewHolder.kt b/app/src/main/java/org/pixeldroid/app/posts/StatusViewHolder.kt
index 924d0a66..39898014 100644
--- a/app/src/main/java/org/pixeldroid/app/posts/StatusViewHolder.kt
+++ b/app/src/main/java/org/pixeldroid/app/posts/StatusViewHolder.kt
@@ -1,6 +1,7 @@
package org.pixeldroid.app.posts
import android.Manifest
+import android.annotation.SuppressLint
import android.app.Activity
import android.content.ClipData
import android.content.Intent
@@ -926,6 +927,7 @@ class AlbumViewPagerAdapter(
}
}
+ @SuppressLint("NotifyDataSetChanged")
fun uncensor(){
sensitive = false
notifyDataSetChanged()
diff --git a/app/src/main/res/layout/activity_album.xml b/app/src/main/res/layout/activity_album.xml
index 31728921..3cc530f3 100644
--- a/app/src/main/res/layout/activity_album.xml
+++ b/app/src/main/res/layout/activity_album.xml
@@ -17,6 +17,7 @@
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 9a776262..78687208 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -1,39 +1,18 @@
-
-
-
-
-
-
+
+
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7cf2925a..56ca870c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,4 +1,4 @@
-
+
@@ -22,7 +22,7 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+