Changed package name

shauleiz · Apr 19, 2024 · 4f794e2 · 4f794e2
1 parent 517edf8
commit 4f794e2
Show file tree

Hide file tree

Showing 18 changed files with 98 additions and 121 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -3,15 +3,15 @@ plugins {
 }
 
 android {
-    namespace = "com.example.thetimemachine"
+    namespace = "com.product.thetimemachine"
     compileSdk = 34
 
     defaultConfig {
-        applicationId = "com.example.thetimemachine"
+        applicationId = "com.product.thetimemachine"
         minSdk = 27
         targetSdk = 34
-        versionCode = 1002
-        versionName = "1.0.3"
+        versionCode = 1004
+        versionName = "1.0.4"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/...etimemachine/ExampleInstrumentedTest.java → ...etimemachine/ExampleInstrumentedTest.java b/...etimemachine/ExampleInstrumentedTest.java → ...etimemachine/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.example.thetimemachine;
+package com.product.thetimemachine;
 
 import android.content.Context;
 

diff --git a/...example/thetimemachine/AlarmReceiver.java → ...product/thetimemachine/AlarmReceiver.java b/...example/thetimemachine/AlarmReceiver.java → ...product/thetimemachine/AlarmReceiver.java
@@ -1,22 +1,22 @@
-package com.example.thetimemachine;
-
-import static com.example.thetimemachine.AlarmService.K_TYPE;
-import static com.example.thetimemachine.AlarmService.SNOOZE;
-import static com.example.thetimemachine.AlarmService.STOP;
-import static com.example.thetimemachine.Data.AlarmItem.FRIDAY;
-import static com.example.thetimemachine.Data.AlarmItem.K_CSNOOZE;
-import static com.example.thetimemachine.Data.AlarmItem.K_HOUR;
-import static com.example.thetimemachine.Data.AlarmItem.K_LABEL;
-import static com.example.thetimemachine.Data.AlarmItem.K_MINUTE;
-import static com.example.thetimemachine.Data.AlarmItem.K_ONEOFF;
-import static com.example.thetimemachine.Data.AlarmItem.K_WEEKDAYS;
-import static com.example.thetimemachine.Data.AlarmItem.MONDAY;
-import static com.example.thetimemachine.Data.AlarmItem.SATURDAY;
-import static com.example.thetimemachine.Data.AlarmItem.SUNDAY;
-import static com.example.thetimemachine.Data.AlarmItem.THURSDAY;
-import static com.example.thetimemachine.Data.AlarmItem.TUESDAY;
-import static com.example.thetimemachine.Data.AlarmItem.WEDNESDAY;
-import static com.example.thetimemachine.Data.AlarmRoomDatabase.insertAlarm;
+package com.product.thetimemachine;
+
+import static com.product.thetimemachine.AlarmService.K_TYPE;
+import static com.product.thetimemachine.AlarmService.SNOOZE;
+import static com.product.thetimemachine.AlarmService.STOP;
+import static com.product.thetimemachine.Data.AlarmItem.FRIDAY;
+import static com.product.thetimemachine.Data.AlarmItem.K_CSNOOZE;
+import static com.product.thetimemachine.Data.AlarmItem.K_HOUR;
+import static com.product.thetimemachine.Data.AlarmItem.K_LABEL;
+import static com.product.thetimemachine.Data.AlarmItem.K_MINUTE;
+import static com.product.thetimemachine.Data.AlarmItem.K_ONEOFF;
+import static com.product.thetimemachine.Data.AlarmItem.K_WEEKDAYS;
+import static com.product.thetimemachine.Data.AlarmItem.MONDAY;
+import static com.product.thetimemachine.Data.AlarmItem.SATURDAY;
+import static com.product.thetimemachine.Data.AlarmItem.SUNDAY;
+import static com.product.thetimemachine.Data.AlarmItem.THURSDAY;
+import static com.product.thetimemachine.Data.AlarmItem.TUESDAY;
+import static com.product.thetimemachine.Data.AlarmItem.WEDNESDAY;
+import static com.product.thetimemachine.Data.AlarmRoomDatabase.insertAlarm;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -25,9 +25,7 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.example.thetimemachine.Data.AlarmDao;
-import com.example.thetimemachine.Data.AlarmItem;
-import com.example.thetimemachine.Data.AlarmRoomDatabase;
+import com.product.thetimemachine.Data.AlarmItem;
 
 import java.util.Calendar;
 import java.util.Locale;

diff --git a/.../example/thetimemachine/AlarmService.java → .../product/thetimemachine/AlarmService.java b/.../example/thetimemachine/AlarmService.java → .../product/thetimemachine/AlarmService.java
@@ -1,25 +1,23 @@
-package com.example.thetimemachine;
+package com.product.thetimemachine;
 
 import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SYSTEM_EXEMPTED;
-import static androidx.core.content.ContextCompat.getSystemService;
-import static com.example.thetimemachine.Application.TheTimeMachineApp.CHANNEL_ID;
-import static com.example.thetimemachine.Application.TheTimeMachineApp.appContext;
-import static com.example.thetimemachine.Data.AlarmItem.K_HOUR;
-import static com.example.thetimemachine.Data.AlarmItem.K_LABEL;
-import static com.example.thetimemachine.Data.AlarmItem.K_MINUTE;
-import static com.example.thetimemachine.Data.AlarmRoomDatabase.insertAlarm;
-import static com.example.thetimemachine.UI.SettingsFragment.pref_alarm_sound;
-import static com.example.thetimemachine.UI.SettingsFragment.pref_gradual_volume;
-import static com.example.thetimemachine.UI.SettingsFragment.pref_is24HourClock;
-import static com.example.thetimemachine.UI.SettingsFragment.pref_ring_duration;
-import static com.example.thetimemachine.UI.SettingsFragment.pref_ring_repeat;
-import static com.example.thetimemachine.UI.SettingsFragment.pref_vibration_pattern;
+import static com.product.thetimemachine.Application.TheTimeMachineApp.CHANNEL_ID;
+import static com.product.thetimemachine.Application.TheTimeMachineApp.appContext;
+import static com.product.thetimemachine.Data.AlarmItem.K_HOUR;
+import static com.product.thetimemachine.Data.AlarmItem.K_LABEL;
+import static com.product.thetimemachine.Data.AlarmItem.K_MINUTE;
+import static com.product.thetimemachine.Data.AlarmRoomDatabase.insertAlarm;
+import static com.product.thetimemachine.UI.SettingsFragment.pref_alarm_sound;
+import static com.product.thetimemachine.UI.SettingsFragment.pref_gradual_volume;
+import static com.product.thetimemachine.UI.SettingsFragment.pref_is24HourClock;
+import static com.product.thetimemachine.UI.SettingsFragment.pref_ring_duration;
+import static com.product.thetimemachine.UI.SettingsFragment.pref_ring_repeat;
+import static com.product.thetimemachine.UI.SettingsFragment.pref_vibration_pattern;
 
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
-import android.content.ContextWrapper;
 import android.content.Intent;
 import android.media.MediaPlayer;
 import android.media.VolumeShaper;
@@ -37,12 +35,9 @@
 import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
 
-import com.example.thetimemachine.Data.AlarmDao;
-import com.example.thetimemachine.Data.AlarmItem;
-import com.example.thetimemachine.Data.AlarmRoomDatabase;
-import com.example.thetimemachine.UI.StopSnoozeActivity;
+import com.product.thetimemachine.Data.AlarmItem;
+import com.product.thetimemachine.UI.StopSnoozeActivity;
 
-import java.io.File;
 import java.util.Locale;
 
 public class AlarmService  extends Service {

diff --git a/...xample/thetimemachine/AlarmViewModel.java → ...roduct/thetimemachine/AlarmViewModel.java b/...xample/thetimemachine/AlarmViewModel.java → ...roduct/thetimemachine/AlarmViewModel.java
@@ -1,4 +1,4 @@
-package com.example.thetimemachine;
+package com.product.thetimemachine;
 
 import android.app.Application;
 import android.util.Log;
@@ -7,8 +7,8 @@
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
-import com.example.thetimemachine.Data.AlarmItem;
-import com.example.thetimemachine.Data.AlarmRepository;
+import com.product.thetimemachine.Data.AlarmItem;
+import com.product.thetimemachine.Data.AlarmRepository;
 
 import java.util.ArrayList;
 import java.util.Calendar;

diff --git a/...achine/Application/TheTimeMachineApp.java → ...achine/Application/TheTimeMachineApp.java b/...achine/Application/TheTimeMachineApp.java → ...achine/Application/TheTimeMachineApp.java
@@ -1,4 +1,4 @@
-package com.example.thetimemachine.Application;
+package com.product.thetimemachine.Application;
 
 import android.app.Application;
 import android.app.NotificationChannel;

diff --git a/...m/example/thetimemachine/BootService.java → ...m/product/thetimemachine/BootService.java b/...m/example/thetimemachine/BootService.java → ...m/product/thetimemachine/BootService.java
@@ -1,4 +1,4 @@
-package com.example.thetimemachine;
+package com.product.thetimemachine;
 
 import android.content.Intent;
 import android.os.IBinder;
@@ -9,8 +9,8 @@
 import androidx.lifecycle.LifecycleService;
 import androidx.lifecycle.Observer;
 
-import com.example.thetimemachine.Data.AlarmItem;
-import com.example.thetimemachine.Data.AlarmRepository;
+import com.product.thetimemachine.Data.AlarmItem;
+import com.product.thetimemachine.Data.AlarmRepository;
 
 import java.util.List;
 

diff --git a/...example/thetimemachine/Data/AlarmDao.java → ...product/thetimemachine/Data/AlarmDao.java b/...example/thetimemachine/Data/AlarmDao.java → ...product/thetimemachine/Data/AlarmDao.java
@@ -1,4 +1,4 @@
-package com.example.thetimemachine.Data;
+package com.product.thetimemachine.Data;
 
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;

diff --git a/...xample/thetimemachine/Data/AlarmItem.java → ...roduct/thetimemachine/Data/AlarmItem.java b/...xample/thetimemachine/Data/AlarmItem.java → ...roduct/thetimemachine/Data/AlarmItem.java
@@ -1,8 +1,8 @@
-package com.example.thetimemachine.Data;
+package com.product.thetimemachine.Data;
 
-import static com.example.thetimemachine.AlarmService.ALARM;
-import static com.example.thetimemachine.AlarmService.K_TYPE;
-import static com.example.thetimemachine.UI.SettingsFragment.pref_snooze_duration;
+import static com.product.thetimemachine.AlarmService.ALARM;
+import static com.product.thetimemachine.AlarmService.K_TYPE;
+import static com.product.thetimemachine.UI.SettingsFragment.pref_snooze_duration;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -17,10 +17,10 @@
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;
 
-import com.example.thetimemachine.AlarmReceiver;
-import com.example.thetimemachine.Application.TheTimeMachineApp;
-import com.example.thetimemachine.R;
-import com.example.thetimemachine.UI.MainActivity;
+import com.product.thetimemachine.AlarmReceiver;
+import com.product.thetimemachine.Application.TheTimeMachineApp;
+import com.product.thetimemachine.R;
+import com.product.thetimemachine.UI.MainActivity;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;

diff --git a/.../thetimemachine/Data/AlarmRepository.java → .../thetimemachine/Data/AlarmRepository.java b/.../thetimemachine/Data/AlarmRepository.java → .../thetimemachine/Data/AlarmRepository.java
@@ -1,4 +1,4 @@
-package com.example.thetimemachine.Data;
+package com.product.thetimemachine.Data;
 
 import android.app.Application;
 

diff --git a/...hetimemachine/Data/AlarmRoomDatabase.java → ...hetimemachine/Data/AlarmRoomDatabase.java b/...hetimemachine/Data/AlarmRoomDatabase.java → ...hetimemachine/Data/AlarmRoomDatabase.java
@@ -1,4 +1,4 @@
-package com.example.thetimemachine.Data;
+package com.product.thetimemachine.Data;
 
 import android.content.Context;
 

diff --git a/...ample/thetimemachine/UI/AlarmAdapter.java → ...oduct/thetimemachine/UI/AlarmAdapter.java b/...ample/thetimemachine/UI/AlarmAdapter.java → ...oduct/thetimemachine/UI/AlarmAdapter.java
@@ -1,24 +1,15 @@
-package com.example.thetimemachine.UI;
+package com.product.thetimemachine.UI;
 
 import static android.widget.TextView.BufferType.SPANNABLE;
 import static androidx.core.content.ContextCompat.getColor;
-import static com.example.thetimemachine.Data.AlarmItem.FRIDAY;
-import static com.example.thetimemachine.Data.AlarmItem.MONDAY;
-import static com.example.thetimemachine.Data.AlarmItem.SATURDAY;
-import static com.example.thetimemachine.Data.AlarmItem.SUNDAY;
-import static com.example.thetimemachine.Data.AlarmItem.THURSDAY;
-import static com.example.thetimemachine.Data.AlarmItem.TUESDAY;
-import static com.example.thetimemachine.Data.AlarmItem.WEDNESDAY;
-import static com.example.thetimemachine.UI.SettingsFragment.pref_first_day_of_week;
-import static com.example.thetimemachine.UI.SettingsFragment.pref_is24HourClock;
+import static com.product.thetimemachine.UI.SettingsFragment.pref_first_day_of_week;
+import static com.product.thetimemachine.UI.SettingsFragment.pref_is24HourClock;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.graphics.Typeface;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
-import android.text.style.StyleSpan;
 import android.text.style.UnderlineSpan;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -31,8 +22,8 @@
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.example.thetimemachine.Data.AlarmItem;
-import com.example.thetimemachine.R;
+import com.product.thetimemachine.Data.AlarmItem;
+import com.product.thetimemachine.R;
 import com.google.android.material.color.MaterialColors;
 
 import java.text.SimpleDateFormat;

diff --git a/.../thetimemachine/UI/AlarmListFragment.java → .../thetimemachine/UI/AlarmListFragment.java b/.../thetimemachine/UI/AlarmListFragment.java → .../thetimemachine/UI/AlarmListFragment.java
@@ -1,11 +1,11 @@
-package com.example.thetimemachine.UI;
+package com.product.thetimemachine.UI;
 
 import static android.Manifest.permission.POST_NOTIFICATIONS;
 import static androidx.core.content.PermissionChecker.PERMISSION_DENIED;
 import static androidx.core.content.PermissionChecker.PERMISSION_GRANTED;
 
-import static com.example.thetimemachine.UI.SettingsFragment.pref_sort_separate;
-import static com.example.thetimemachine.UI.SettingsFragment.pref_sort_type;
+import static com.product.thetimemachine.UI.SettingsFragment.pref_sort_separate;
+import static com.product.thetimemachine.UI.SettingsFragment.pref_sort_type;
 
 import android.content.Context;
 import android.content.Intent;
@@ -37,18 +37,17 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.example.thetimemachine.AlarmReceiver;
-import com.example.thetimemachine.AlarmService;
-import com.example.thetimemachine.Data.AlarmItem;
-import com.example.thetimemachine.R;
+import com.product.thetimemachine.AlarmReceiver;
+import com.product.thetimemachine.AlarmService;
+import com.product.thetimemachine.Data.AlarmItem;
+import com.product.thetimemachine.R;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
-import java.util.Objects;
 
 
 public class AlarmListFragment extends Fragment {

diff --git a/...ample/thetimemachine/UI/MainActivity.java → ...oduct/thetimemachine/UI/MainActivity.java b/...ample/thetimemachine/UI/MainActivity.java → ...oduct/thetimemachine/UI/MainActivity.java
@@ -1,4 +1,4 @@
-package com.example.thetimemachine.UI;
+package com.product.thetimemachine.UI;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -14,8 +14,8 @@
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 
-import com.example.thetimemachine.AlarmViewModel;
-import com.example.thetimemachine.R;
+import com.product.thetimemachine.AlarmViewModel;
+import com.product.thetimemachine.R;
 
 
 public class MainActivity extends AppCompatActivity {

diff --git a/...thetimemachine/UI/SetUpAlarmFragment.java → ...thetimemachine/UI/SetUpAlarmFragment.java b/...thetimemachine/UI/SetUpAlarmFragment.java → ...thetimemachine/UI/SetUpAlarmFragment.java
@@ -1,15 +1,15 @@
-package com.example.thetimemachine.UI;
+package com.product.thetimemachine.UI;
 
 import static android.icu.util.TimeZone.getTimeZone;
-import static com.example.thetimemachine.Data.AlarmItem.FRIDAY;
-import static com.example.thetimemachine.Data.AlarmItem.MONDAY;
-import static com.example.thetimemachine.Data.AlarmItem.SATURDAY;
-import static com.example.thetimemachine.Data.AlarmItem.SUNDAY;
-import static com.example.thetimemachine.Data.AlarmItem.THURSDAY;
-import static com.example.thetimemachine.Data.AlarmItem.TUESDAY;
-import static com.example.thetimemachine.Data.AlarmItem.WEDNESDAY;
-import static com.example.thetimemachine.UI.SettingsFragment.pref_first_day_of_week;
-import static com.example.thetimemachine.UI.SettingsFragment.pref_is24HourClock;
+import static com.product.thetimemachine.Data.AlarmItem.FRIDAY;
+import static com.product.thetimemachine.Data.AlarmItem.MONDAY;
+import static com.product.thetimemachine.Data.AlarmItem.SATURDAY;
+import static com.product.thetimemachine.Data.AlarmItem.SUNDAY;
+import static com.product.thetimemachine.Data.AlarmItem.THURSDAY;
+import static com.product.thetimemachine.Data.AlarmItem.TUESDAY;
+import static com.product.thetimemachine.Data.AlarmItem.WEDNESDAY;
+import static com.product.thetimemachine.UI.SettingsFragment.pref_first_day_of_week;
+import static com.product.thetimemachine.UI.SettingsFragment.pref_is24HourClock;
 
 import android.app.DatePickerDialog;
 import android.icu.text.SimpleDateFormat;
@@ -34,9 +34,9 @@
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.Observer;
 
-import com.example.thetimemachine.AlarmViewModel;
-import com.example.thetimemachine.Data.AlarmItem;
-import com.example.thetimemachine.R;
+import com.product.thetimemachine.AlarmViewModel;
+import com.product.thetimemachine.Data.AlarmItem;
+import com.product.thetimemachine.R;
 import com.google.android.material.button.MaterialButtonToggleGroup;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.textfield.TextInputEditText;

diff --git a/...e/thetimemachine/UI/SettingsFragment.java → ...t/thetimemachine/UI/SettingsFragment.java b/...e/thetimemachine/UI/SettingsFragment.java → ...t/thetimemachine/UI/SettingsFragment.java
@@ -1,14 +1,9 @@
-package com.example.thetimemachine.UI;
+package com.product.thetimemachine.UI;
 
-import static androidx.core.content.ContextCompat.getSystemService;
-
-import static com.example.thetimemachine.Application.TheTimeMachineApp.appContext;
+import static com.product.thetimemachine.Application.TheTimeMachineApp.appContext;
 
 import android.content.Context;
-import android.content.ContextWrapper;
 import android.content.SharedPreferences;
-import android.content.pm.ActivityInfo;
-import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Vibrator;
@@ -18,13 +13,12 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
-import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
-import com.example.thetimemachine.AlarmService;
-import com.example.thetimemachine.Application.TheTimeMachineApp;
-import com.example.thetimemachine.R;
+import com.product.thetimemachine.AlarmService;
+import com.product.thetimemachine.Application.TheTimeMachineApp;
+import com.product.thetimemachine.R;
 
 import java.util.Objects;