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(
|
WorkManager.initialize(
|
||||||
this@App,
|
this@App,
|
||||||
Configuration.Builder()
|
Configuration.Builder()
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,6 @@ class MainActivity : BaseActivity() {
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
ThemeUtil.updateTheme(this)
|
|
||||||
setContentView(R.layout.activity_main)
|
setContentView(R.layout.activity_main)
|
||||||
context = baseContext
|
context = baseContext
|
||||||
resultViewModel = ViewModelProvider(this)[ResultViewModel::class.java]
|
resultViewModel = ViewModelProvider(this)[ResultViewModel::class.java]
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,6 @@ class ShareActivity : BaseActivity() {
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
ThemeUtil.updateTheme(this)
|
|
||||||
WindowCompat.setDecorFitsSystemWindows(window, false)
|
WindowCompat.setDecorFitsSystemWindows(window, false)
|
||||||
ViewCompat.setOnApplyWindowInsetsListener(window.decorView) { v, insets ->
|
ViewCompat.setOnApplyWindowInsetsListener(window.decorView) { v, insets ->
|
||||||
v.setPadding(0, 0, 0, 0)
|
v.setPadding(0, 0, 0, 0)
|
||||||
|
|
|
||||||
|
|
@ -127,31 +127,33 @@ class NotificationUtil(var context: Context) {
|
||||||
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
|
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
|
||||||
.clearActions()
|
.clearActions()
|
||||||
if (filepath != null){
|
if (filepath != null){
|
||||||
val file = File(filepath)
|
try{
|
||||||
val uri = FileProvider.getUriForFile(
|
val file = File(filepath)
|
||||||
context,
|
val uri = FileProvider.getUriForFile(
|
||||||
"com.deniscerri.ytdl.fileprovider",
|
context,
|
||||||
file
|
"com.deniscerri.ytdl.fileprovider",
|
||||||
)
|
file
|
||||||
|
)
|
||||||
|
|
||||||
//open intent
|
//open intent
|
||||||
val intent = Intent()
|
val intent = Intent()
|
||||||
intent.action = Intent.ACTION_VIEW
|
intent.action = Intent.ACTION_VIEW
|
||||||
intent.setDataAndType(uri, "*/*")
|
intent.setDataAndType(uri, "*/*")
|
||||||
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
|
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
|
||||||
val openNotificationPendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE)
|
val openNotificationPendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE)
|
||||||
|
|
||||||
//share intent
|
//share intent
|
||||||
val shareIntent = Intent(context, SharedDownloadNotificationReceiver::class.java)
|
val shareIntent = Intent(context, SharedDownloadNotificationReceiver::class.java)
|
||||||
shareIntent.putExtra("share", "")
|
shareIntent.putExtra("share", "")
|
||||||
shareIntent.putExtra("path", filepath)
|
shareIntent.putExtra("path", filepath)
|
||||||
shareIntent.putExtra("notificationID", DOWNLOAD_FINISHED_NOTIFICATION_ID)
|
shareIntent.putExtra("notificationID", DOWNLOAD_FINISHED_NOTIFICATION_ID)
|
||||||
shareIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
|
shareIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
|
||||||
val shareNotificationPendingIntent = PendingIntent.getActivity(context, 0, shareIntent, PendingIntent.FLAG_IMMUTABLE)
|
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.Open_File), openNotificationPendingIntent)
|
||||||
notificationBuilder.addAction(0, context.getString(R.string.share), shareNotificationPendingIntent)
|
notificationBuilder.addAction(0, context.getString(R.string.share), shareNotificationPendingIntent)
|
||||||
|
}catch (_: Exception){}
|
||||||
}
|
}
|
||||||
notificationManager.notify(DOWNLOAD_FINISHED_NOTIFICATION_ID, notificationBuilder.build())
|
notificationManager.notify(DOWNLOAD_FINISHED_NOTIFICATION_ID, notificationBuilder.build())
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue