diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3e77b4a..13d534b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,6 +10,7 @@ - diff --git a/app/src/main/java/com/harsh/askgemini/feature/multimodal/PhotoReasoningScreen.kt b/app/src/main/java/com/harsh/askgemini/feature/multimodal/PhotoReasoningScreen.kt index c696581..7c970ff 100644 --- a/app/src/main/java/com/harsh/askgemini/feature/multimodal/PhotoReasoningScreen.kt +++ b/app/src/main/java/com/harsh/askgemini/feature/multimodal/PhotoReasoningScreen.kt @@ -67,7 +67,6 @@ import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.isGranted import com.google.accompanist.permissions.rememberPermissionState import com.harsh.askgemini.R -import com.harsh.askgemini.navigation.WindowNavigationItem import com.harsh.askgemini.ui.DotLoadingAnimation import com.harsh.askgemini.ui.ErrorLayout import com.harsh.askgemini.ui.SuccessLayout diff --git a/app/src/main/java/com/harsh/askgemini/feature/text/SummarizeViewModel.kt b/app/src/main/java/com/harsh/askgemini/feature/text/SummarizeViewModel.kt index 2b692db..73a5cf6 100644 --- a/app/src/main/java/com/harsh/askgemini/feature/text/SummarizeViewModel.kt +++ b/app/src/main/java/com/harsh/askgemini/feature/text/SummarizeViewModel.kt @@ -27,21 +27,23 @@ class SummarizeViewModel(private val generativeModel: GenerativeModel) : ViewMod _uiState.value = SummarizeUiState.Error(errorMessage = e.localizedMessage ?: "") } } - } + }*/ - fun summarizeForNotification(inputText: String): String? { + /*fun summarizeForNotification(inputText: String): String? { + var facts: String? = null viewModelScope.launch { try { val response = generativeModel.generateContent(inputText) response.text?.let { outputText -> - _uiState.value = SummarizeUiState.Success(outputText = outputText) - outputText + //_uiState.value = SummarizeUiState.Success(outputText = outputText) + facts = outputText } } catch (e: Exception) { - _uiState.value = SummarizeUiState.Error(errorMessage = e.localizedMessage ?: "") + //_uiState.value = SummarizeUiState.Error(errorMessage = e.localizedMessage ?: "") + facts = e.localizedMessage } } - return null + return facts }*/ suspend fun summarizeStreaming(inputText: String) { diff --git a/app/src/main/java/com/harsh/askgemini/notification/AlarmReceiver.kt b/app/src/main/java/com/harsh/askgemini/notification/AlarmReceiver.kt deleted file mode 100644 index e7e6d0e..0000000 --- a/app/src/main/java/com/harsh/askgemini/notification/AlarmReceiver.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.harsh.askgemini.notification - -import android.app.NotificationManager -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent - -class AlarmReceiver : BroadcastReceiver() { - override fun onReceive(context: Context?, intent: Intent?) { - context?.let { - val notificationManager = - it.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager - val runnerNotifier = RunnerNotifier(notificationManager, it) - runnerNotifier.showNotification() - } - } -} diff --git a/app/src/main/java/com/harsh/askgemini/notification/AlarmScheduler.kt b/app/src/main/java/com/harsh/askgemini/notification/AlarmScheduler.kt deleted file mode 100644 index d6481cd..0000000 --- a/app/src/main/java/com/harsh/askgemini/notification/AlarmScheduler.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.harsh.askgemini.notification - -import android.app.PendingIntent - -interface AlarmScheduler { - - fun createPendingIntent(reminderItem: ReminderItem): PendingIntent - - fun schedule(reminderItem: ReminderItem) - - fun cancel(reminderItem: ReminderItem) - -} diff --git a/app/src/main/java/com/harsh/askgemini/notification/NotificationAlarmScheduler.kt b/app/src/main/java/com/harsh/askgemini/notification/NotificationAlarmScheduler.kt deleted file mode 100644 index 3e0ee50..0000000 --- a/app/src/main/java/com/harsh/askgemini/notification/NotificationAlarmScheduler.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.harsh.askgemini.notification - -import android.app.AlarmManager -import android.app.PendingIntent -import android.content.Context -import android.content.Intent - -// Scheduling and cancelling alarm -class NotificationAlarmScheduler(private val context: Context) : AlarmScheduler { - - private val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager - - override fun createPendingIntent(reminderItem: ReminderItem): PendingIntent { - val intent = Intent(context, AlarmReceiver::class.java) - - return PendingIntent.getBroadcast( - /* context = */ context, - /* requestCode = */ reminderItem.id, - /* intent = */ intent, - /* flags = */ PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE - ) - } - - override fun schedule(reminderItem: ReminderItem) { - alarmManager.setRepeating( - /* type = */ AlarmManager.RTC_WAKEUP, - /* triggerAtMillis = */ reminderItem.time, - /* intervalMillis = */ AlarmManager.INTERVAL_DAY, - /* operation = */ createPendingIntent(reminderItem) - ) - } - - override fun cancel(reminderItem: ReminderItem) { - alarmManager.cancel( - createPendingIntent(reminderItem) - ) - } -} diff --git a/app/src/main/java/com/harsh/askgemini/notification/Notifier.kt b/app/src/main/java/com/harsh/askgemini/notification/Notifier.kt deleted file mode 100644 index 28dfa41..0000000 --- a/app/src/main/java/com/harsh/askgemini/notification/Notifier.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.harsh.askgemini.notification - -import android.app.Notification -import android.app.NotificationChannel -import android.app.NotificationManager -import android.os.Build -import androidx.annotation.RequiresApi - -abstract class Notifier(private val notificationManager: NotificationManager) { - - abstract val notificationChannelId: String - abstract val notificationChannelName: String - abstract val notificationId: Int - - fun showNotification() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - val channel = createNotificationChannel() - notificationManager.createNotificationChannel(channel) - } - val notification = buildNotification() - notificationManager.notify(notificationId,notification) - } - - @RequiresApi(Build.VERSION_CODES.O) - open fun createNotificationChannel( - importance: Int = NotificationManager.IMPORTANCE_DEFAULT, - ): NotificationChannel { - return NotificationChannel( - /* id = */ notificationChannelId, - /* name = */ notificationChannelName, - /* importance = */ importance - ) - } - - abstract fun buildNotification(): Notification - protected abstract fun getNotificationTitle(): String - protected abstract fun getNotificationMessage(): String -} diff --git a/app/src/main/java/com/harsh/askgemini/notification/ReminderItem.kt b/app/src/main/java/com/harsh/askgemini/notification/ReminderItem.kt deleted file mode 100644 index e912ba1..0000000 --- a/app/src/main/java/com/harsh/askgemini/notification/ReminderItem.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.harsh.askgemini.notification - -data class ReminderItem(val time: Long, val id: Int) diff --git a/app/src/main/java/com/harsh/askgemini/notification/RunnerNotifier.kt b/app/src/main/java/com/harsh/askgemini/notification/RunnerNotifier.kt deleted file mode 100644 index 94e4ac1..0000000 --- a/app/src/main/java/com/harsh/askgemini/notification/RunnerNotifier.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.harsh.askgemini.notification - -import android.app.Notification -import android.app.NotificationManager -import android.content.Context -import androidx.core.app.NotificationCompat -import com.harsh.askgemini.util.Cupboard - -// To configure the necessary settings for sending a notification. -class RunnerNotifier( - notificationManager: NotificationManager, - private val context: Context -) : Notifier(notificationManager) { - - override val notificationChannelId: String = "gk_channel_id" - override val notificationChannelName: String = "GK notification" - override val notificationId: Int = 200 - - override fun buildNotification(): Notification { - return NotificationCompat.Builder(context,notificationChannelId) - .setContentTitle(getNotificationTitle()) - .setContentText(getNotificationMessage()) - .setSmallIcon(android.R.drawable.btn_star) - .build() - } - - override fun getNotificationTitle(): String = "Do you know? : " - - override fun getNotificationMessage(): String { - return Cupboard.randomNotificationMessage() - } -}