Merge pull request #25 from WrichikBasu/dev

Modified UI in Settings activity, removed support for Intent.ACTION_DATE_CHANGED
WrichikBasu · Nov 23, 2020 · b8019f3 · b8019f3
2 parents d3bde6e + c72fd24
commit b8019f3
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 110 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "in.basulabs.shakealarmclock"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 15
-        versionName "1.3.0"
+        versionCode 16
+        versionName "1.3.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,6 @@
     <uses-feature android:name="android.hardware.sensor.accelerometer" android:required="true"/>
 
     <application
-        android:name=".MyApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

diff --git a/app/src/main/java/in/basulabs/shakealarmclock/Activity_AlarmsList.java b/app/src/main/java/in/basulabs/shakealarmclock/Activity_AlarmsList.java
@@ -1,6 +1,5 @@
 package in.basulabs.shakealarmclock;
 
-import android.annotation.SuppressLint;
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -66,9 +65,6 @@ public class Activity_AlarmsList extends AppCompatActivity implements AlarmAdapt
 	private static final int MODE_DELETE_ALARM = 504;
 	private static final int MODE_DEACTIVATE_ONLY = 509;
 
-	@SuppressLint("StaticFieldLeak")
-	private static Activity_AlarmsList myInstance;
-
 	//--------------------------------------------------------------------------------------------------
 
 	@Override
@@ -91,8 +87,6 @@ protected void onCreate(Bundle savedInstanceState) {
 					.setDefaultNightMode(ConstantsAndStatics.getTheme(sharedPreferences.getInt(ConstantsAndStatics.SHARED_PREF_KEY_THEME, defaultTheme)));
 		}
 
-		myInstance = this;
-
 		Button addAlarmButton = findViewById(R.id.addAlarmButton);
 		addAlarmButton.setOnClickListener(view -> {
 			Intent intent = new Intent(this, Activity_AlarmDetails.class);
@@ -156,13 +150,11 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
 		return super.onOptionsItemSelected(item);
 	}
 
-
 	//--------------------------------------------------------------------------------------------------
 
 	@Override
 	protected void onDestroy() {
 		super.onDestroy();
-		myInstance = null;
 		ConstantsAndStatics.schedulePeriodicWork(this);
 	}
 
@@ -178,13 +170,12 @@ private void manageViewStub(int count) {
 	}
 
 	//--------------------------------------------------------------------------------------------------
-
-	public static void onDateChanged() {
-		if (myInstance != null) {
-			myInstance.viewModel.forceInit(myInstance.alarmDatabase);
-			myInstance.alarmAdapter = new AlarmAdapter(myInstance.viewModel.getAlarmDataArrayList(), myInstance, myInstance);
-			myInstance.alarmsRecyclerView.swapAdapter(myInstance.alarmAdapter, false);
-		}
+
+	@SuppressWarnings({"unused", "RedundantSuppression"})
+	private void onDateChanged() {
+		viewModel.forceInit(alarmDatabase);
+		alarmAdapter = new AlarmAdapter(viewModel.getAlarmDataArrayList(), this, this);
+		alarmsRecyclerView.swapAdapter(alarmAdapter, false);
 	}
 
 	//--------------------------------------------------------------------------------------------------
@@ -474,7 +465,7 @@ public void handleMessage(@NonNull Message msg) {
 	private void showDialogs() {
 
 		boolean showBatteryOptimDialog = getSharedPreferences(ConstantsAndStatics.SHARED_PREF_FILE_NAME, MODE_PRIVATE)
-						.getBoolean(ConstantsAndStatics.SHARED_PREF_KEY_SHOW_BATTERY_OPTIM_DIALOG, true);
+				.getBoolean(ConstantsAndStatics.SHARED_PREF_KEY_SHOW_BATTERY_OPTIM_DIALOG, true);
 
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && showBatteryOptimDialog) {
 			PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE);
@@ -493,7 +484,7 @@ private void showDialogs() {
 	/**
 	 * Checks for updates from Google Play.
 	 * <p>
-	 *     Courtsey: https://github.com/javiersantos/AppUpdater
+	 * Courtsey: https://github.com/javiersantos/AppUpdater
 	 * </p>
 	 */
 	private void checkForUpdatesFromGooglePlay() {
@@ -522,7 +513,7 @@ private void checkForUpdatesFromGooglePlay() {
 	/**
 	 * Checks for updates from Github.
 	 * <p>
-	 *     Courtsey: https://github.com/javiersantos/AppUpdater
+	 * Courtsey: https://github.com/javiersantos/AppUpdater
 	 * </p>
 	 */
 	@SuppressWarnings({"unused", "RedundantSuppression"})

diff --git a/app/src/main/java/in/basulabs/shakealarmclock/MyApplication.java b/app/src/main/java/in/basulabs/shakealarmclock/MyApplication.java
diff --git a/app/src/main/res/layout/recyclerviewrow_alarmslist.xml b/app/src/main/res/layout/recyclerviewrow_alarmslist.xml
@@ -47,11 +47,11 @@
                 android:gravity="center"
                 android:text="00:00 AM"
                 android:textAlignment="center"
-                android:textSize="25sp"
                 android:textColor="@color/defaultLabelColor"
+                android:textSize="25sp"
                 app:layout_constraintBottom_toTopOf="@+id/space"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.19"
+                app:layout_constraintHorizontal_bias="0.13"
                 app:layout_constraintStart_toEndOf="@+id/alarmOnOffImgBtn"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_bias="0.61"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -109,8 +109,8 @@
         <item>Snooze the alarm.</item>
         <item>Dismiss the alarm.</item>
     </string-array>
-    <string name="settings_snoozeOps"><b>Default snooze options</b>\n(These will be the default snooze options
-        when you create a new alarm.)</string>
+    <string name="settings_snoozeOps"><b>Default snooze options</b>\n<small>(These will be the default snooze options
+        when you create a new alarm.)</small></string>
     <string name="settings_snoozeInterval">Snooze interval in minutes:</string>
     <string name="settings_snoozeFreq">Snooze frequency:</string>
 
@@ -129,15 +129,15 @@
 
     <string name="settings_toneUri">Default alarm tone:</string>
     <string name="settings_volume">Default alarm volume:</string>
-    <string name="settings_toneCheckbox">Automatically set new tones I select as default tones</string>
+    <string name="settings_toneCheckbox">Automatically set new tones I select as default tones for new alarms</string>
 
-    <string name="settings_shakeSensitivityMainLabel"><b>Shake sensitivity settings</b>\nTest the sensitivity of the shake
-    detector, and change it as you wish</string>
-    <string name="shakeSensitivityChangeLabel">Change sensitivity:</string>
+    <string name="settings_shakeSensitivityMainLabel"><b>Shake sensitivity settings</b>\n<small>Test the sensitivity of the shake
+        detector, and change it as you wish</small></string>
+    <string name="shakeSensitivityChangeLabel"><small>Change sensitivity:</small></string>
     <string name="leastSensitiveLabel">\u2191\nLeast\nsensitive</string>
     <string name="mostSensitiveLabel">\u2191\nMost\nsensitive</string>
-    <string name="testShake">Test shake sensitivity\n<i>Tap to enable the shake detector so that you can
-        choose the sensitivity that correctly suits you.</i></string>
+    <string name="testShake"><small><b>Test shake sensitivity</b>\nTap to enable the shake detector so that you can
+        choose the sensitivity that correctly suits you.</small></string>
 
     <!-- Service_UpdateAlarm -->
     <string name="updateAlarm_notifMessage">Activating alarms. This may take a while…</string>
@@ -158,7 +158,6 @@
     <string name="batteryOptim_negative">Maybe later</string>
     <string name="batteryOptim_neutral">Never show again</string>
 
-
     <string name="defaultAlarmToneText">Default alarm tone</string>
 
 </resources>