usage: remove "Yesterday" option from the interval selector

Also, replaced "Today" with "Daily".

Signed-off-by: Muntashir Al-Islam <muntashirakon@riseup.net>

Author: MuntashirAkon

app/src/main/java/io/github/muntashirakon/AppManager/usage/AppUsageAdapter.java

@@ -2,11 +2,6 @@
 
 package io.github.muntashirakon.AppManager.usage;
 
-import static io.github.muntashirakon.AppManager.usage.UsageUtils.USAGE_LAST_BOOT;
-import static io.github.muntashirakon.AppManager.usage.UsageUtils.USAGE_TODAY;
-import static io.github.muntashirakon.AppManager.usage.UsageUtils.USAGE_WEEKLY;
-import static io.github.muntashirakon.AppManager.usage.UsageUtils.USAGE_YESTERDAY;
-
 import android.graphics.drawable.Drawable;
 import android.text.format.Formatter;
 import android.view.LayoutInflater;
@@ -145,17 +140,12 @@ public void onBindViewHolder(@NonNull ListHeaderViewHolder holder) {
 
         holder.screenTimeView.setText(DateUtils.getFormattedDuration(mActivity, mActivity.viewModel.getTotalScreenTime()));
         switch (currentInterval) {
-            case USAGE_TODAY:
+            case IntervalType.INTERVAL_DAILY:
                 holder.usageIntervalView.setText(R.string.usage_today);
                 break;
-            case USAGE_YESTERDAY:
-                holder.usageIntervalView.setText(R.string.usage_yesterday);
-                break;
-            case USAGE_WEEKLY:
+            case IntervalType.INTERVAL_WEEKLY:
                 holder.usageIntervalView.setText(R.string.usage_7_days);
                 break;
-            case USAGE_LAST_BOOT:
-                break;
         }
 
     }
@@ -182,8 +172,8 @@ public void onBindViewHolder(@NonNull ListItemViewHolder holder, int position) {
         holder.packageName.setText(usageInfo.packageName);
         // Set usage
         long lastTimeUsed = usageInfo.lastUsageTime > 1 ? (System.currentTimeMillis() - usageInfo.lastUsageTime) : 0;
-        if (mActivity.viewModel.getCurrentInterval() != USAGE_YESTERDAY
-                && usageInfo.packageName.equals(BuildConfig.APPLICATION_ID)) {
+        if (usageInfo.packageName.equals(BuildConfig.APPLICATION_ID)) {
+            // TODO: 9/20/25 Display this only for the present day/week
             // Special case for App Manager since the user is using the app right now
             holder.lastUsageDate.setText(R.string.running);
         } else if (lastTimeUsed > 1) {

app/src/main/java/io/github/muntashirakon/AppManager/usage/AppUsageViewModel.java

@@ -2,8 +2,6 @@
 
 package io.github.muntashirakon.AppManager.usage;
 
-import static io.github.muntashirakon.AppManager.usage.UsageUtils.USAGE_TODAY;
-
 import android.app.Application;
 
 import androidx.annotation.AnyThread;
@@ -30,8 +28,8 @@ public class AppUsageViewModel extends AndroidViewModel {
 
     private long mTotalScreenTime;
     private boolean mHasMultipleUsers;
-    @UsageUtils.IntervalType
-    private int mCurrentInterval = USAGE_TODAY;
+    @IntervalType
+    private int mCurrentInterval = IntervalType.INTERVAL_DAILY;
     private int mSortOrder = SortOrder.SORT_BY_SCREEN_TIME;
 
     public AppUsageViewModel(@NonNull Application application) {
@@ -46,12 +44,12 @@ public LiveData<PackageUsageInfo> getPackageUsageInfo() {
         return mPackageUsageInfoLiveData;
     }
 
-    public void setCurrentInterval(@UsageUtils.IntervalType int currentInterval) {
+    public void setCurrentInterval(@IntervalType int currentInterval) {
         mCurrentInterval = currentInterval;
         loadPackageUsageInfoList();
     }
 
-    @UsageUtils.IntervalType
+    @IntervalType
     public int getCurrentInterval() {
         return mCurrentInterval;
     }

app/src/main/java/io/github/muntashirakon/AppManager/usage/IntervalType.java

@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package io.github.muntashirakon.AppManager.usage;
+
+import androidx.annotation.IntDef;
+
+@IntDef({IntervalType.INTERVAL_DAILY, IntervalType.INTERVAL_WEEKLY})
+public @interface IntervalType {
+    int INTERVAL_DAILY = 0;
+    int INTERVAL_WEEKLY = 1;
+}

app/src/main/java/io/github/muntashirakon/AppManager/usage/TimeInterval.java

@@ -15,7 +15,7 @@ public TimeInterval(int intervalType, long begin, long end) {
 
     public TimeInterval(long begin, long end) {
         super(begin, end);
-        mIntervalType = UsageUtils.USAGE_TODAY;
+        mIntervalType = IntervalType.INTERVAL_DAILY;
     }
 
     public int getIntervalType() {

app/src/main/java/io/github/muntashirakon/AppManager/usage/UsageUtils.java

@@ -4,38 +4,19 @@
 
 import android.os.SystemClock;
 
-import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 
 import java.util.Calendar;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 
 public final class UsageUtils {
-    @IntDef(value = {
-            USAGE_TODAY,
-            USAGE_YESTERDAY,
-            USAGE_WEEKLY,
-            USAGE_LAST_BOOT
-    })
-    public @interface IntervalType {
-    }
-
-    public static final int USAGE_TODAY = 0;
-    public static final int USAGE_YESTERDAY = 1;
-    public static final int USAGE_WEEKLY = 2;
-    public static final int USAGE_LAST_BOOT = 5;
-
     @NonNull
     public static TimeInterval getTimeInterval(@IntervalType int sort) {
         switch (sort) {
-            case USAGE_YESTERDAY:
-                return getYesterday();
-            case USAGE_WEEKLY:
+            case IntervalType.INTERVAL_WEEKLY:
                 return getLastWeek();
-            case USAGE_LAST_BOOT:
-                return getSinceLastBoot();
-            case USAGE_TODAY:
+            case IntervalType.INTERVAL_DAILY:
             default:
                 return getToday();
         }
@@ -88,7 +69,7 @@ public static TimeInterval getDayBounds(long date) {
         calendar.set(Calendar.SECOND, 59);
         calendar.set(Calendar.MILLISECOND, 999);
         long endOfDay = calendar.getTimeInMillis();
-        return new TimeInterval(USAGE_TODAY, beginningOfDay, endOfDay);
+        return new TimeInterval(IntervalType.INTERVAL_DAILY, beginningOfDay, endOfDay);
     }
 
     /**
@@ -210,7 +191,7 @@ public static TimeInterval getWeekBounds(int weekNumber, int year) {
 
         // Set weekStart to beginning of Monday (00:00:00.000)
         Calendar startCal = Calendar.getInstance(TimeZone.getDefault());
-         startCal.setTimeInMillis(weekStart);
+        startCal.setTimeInMillis(weekStart);
         startCal.set(Calendar.HOUR_OF_DAY, 0);
         startCal.set(Calendar.MINUTE, 0);
         startCal.set(Calendar.SECOND, 0);
@@ -224,7 +205,7 @@ public static TimeInterval getWeekBounds(int weekNumber, int year) {
         endCal.set(Calendar.SECOND, 59);
         endCal.set(Calendar.MILLISECOND, 999);
 
-        return new TimeInterval(USAGE_WEEKLY, startCal.getTimeInMillis(), endCal.getTimeInMillis());
+        return new TimeInterval(IntervalType.INTERVAL_WEEKLY, startCal.getTimeInMillis(), endCal.getTimeInMillis());
     }
 
     /**

app/src/main/res/values/arrays.xml

@@ -66,8 +66,7 @@
         <item>@string/type_uri_array_list</item>
     </string-array>
     <string-array name="usage_interval_dropdown_list">
-        <item>@string/usage_today</item>
-        <item>@string/usage_yesterday</item>
+        <item>@string/usage_daily</item>
         <item>@string/usage_weekly</item>
     </string-array>
     <string-array name="whats_new_titles">
@@ -273,4 +272,5 @@
         <item>trackers</item>
         <item>version_name</item>
     </string-array>
+    <string name="usage_daily">Daily</string>
 </resources>