theme fixes
This commit is contained in:
parent
a890213596
commit
e0bc57655a
4 changed files with 23 additions and 31 deletions
|
|
@ -47,14 +47,6 @@ class App : Application() {
|
|||
}
|
||||
}
|
||||
|
||||
AppCompatDelegate.setDefaultNightMode(
|
||||
when(sharedPreferences.getString("ytdlnis_theme", "Default")){
|
||||
"Default" -> MODE_NIGHT_FOLLOW_SYSTEM
|
||||
"Dark" -> MODE_NIGHT_YES
|
||||
else -> MODE_NIGHT_NO
|
||||
}
|
||||
)
|
||||
|
||||
WorkManager.initialize(
|
||||
this@App,
|
||||
Configuration.Builder()
|
||||
|
|
|
|||
|
|
@ -66,7 +66,6 @@ class MainActivity : BaseActivity() {
|
|||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
ThemeUtil.updateTheme(this)
|
||||
setContentView(R.layout.activity_main)
|
||||
context = baseContext
|
||||
resultViewModel = ViewModelProvider(this)[ResultViewModel::class.java]
|
||||
|
|
|
|||
|
|
@ -57,7 +57,6 @@ class ShareActivity : BaseActivity() {
|
|||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
ThemeUtil.updateTheme(this)
|
||||
WindowCompat.setDecorFitsSystemWindows(window, false)
|
||||
ViewCompat.setOnApplyWindowInsetsListener(window.decorView) { v, insets ->
|
||||
v.setPadding(0, 0, 0, 0)
|
||||
|
|
|
|||
|
|
@ -127,31 +127,33 @@ class NotificationUtil(var context: Context) {
|
|||
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
|
||||
.clearActions()
|
||||
if (filepath != null){
|
||||
val file = File(filepath)
|
||||
val uri = FileProvider.getUriForFile(
|
||||
context,
|
||||
"com.deniscerri.ytdl.fileprovider",
|
||||
file
|
||||
)
|
||||
try{
|
||||
val file = File(filepath)
|
||||
val uri = FileProvider.getUriForFile(
|
||||
context,
|
||||
"com.deniscerri.ytdl.fileprovider",
|
||||
file
|
||||
)
|
||||
|
||||
//open intent
|
||||
val intent = Intent()
|
||||
intent.action = Intent.ACTION_VIEW
|
||||
intent.setDataAndType(uri, "*/*")
|
||||
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
|
||||
val openNotificationPendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE)
|
||||
//open intent
|
||||
val intent = Intent()
|
||||
intent.action = Intent.ACTION_VIEW
|
||||
intent.setDataAndType(uri, "*/*")
|
||||
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
|
||||
val openNotificationPendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE)
|
||||
|
||||
//share intent
|
||||
val shareIntent = Intent(context, SharedDownloadNotificationReceiver::class.java)
|
||||
shareIntent.putExtra("share", "")
|
||||
shareIntent.putExtra("path", filepath)
|
||||
shareIntent.putExtra("notificationID", DOWNLOAD_FINISHED_NOTIFICATION_ID)
|
||||
shareIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
|
||||
val shareNotificationPendingIntent = PendingIntent.getActivity(context, 0, shareIntent, PendingIntent.FLAG_IMMUTABLE)
|
||||
//share intent
|
||||
val shareIntent = Intent(context, SharedDownloadNotificationReceiver::class.java)
|
||||
shareIntent.putExtra("share", "")
|
||||
shareIntent.putExtra("path", filepath)
|
||||
shareIntent.putExtra("notificationID", DOWNLOAD_FINISHED_NOTIFICATION_ID)
|
||||
shareIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
|
||||
val shareNotificationPendingIntent = PendingIntent.getActivity(context, 0, shareIntent, PendingIntent.FLAG_IMMUTABLE)
|
||||
|
||||
|
||||
notificationBuilder.addAction(0, context.getString(R.string.Open_File), openNotificationPendingIntent)
|
||||
notificationBuilder.addAction(0, context.getString(R.string.share), shareNotificationPendingIntent)
|
||||
notificationBuilder.addAction(0, context.getString(R.string.Open_File), openNotificationPendingIntent)
|
||||
notificationBuilder.addAction(0, context.getString(R.string.share), shareNotificationPendingIntent)
|
||||
}catch (_: Exception){}
|
||||
}
|
||||
notificationManager.notify(DOWNLOAD_FINISHED_NOTIFICATION_ID, notificationBuilder.build())
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue