Skip to content

Commit 5b76f9c

Browse files
amrbashiramrbashir
committed
refactor: cleanup code
1 parent 7525cc8 commit 5b76f9c

24 files changed

Lines changed: 398 additions & 405 deletions

‎app/src/main/AndroidManifest.xml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
</activity>
6767

6868
<activity-alias
69-
android:name=".preferences.Calendar_1"
69+
android:name=".preference_activity.Calendar_1"
7070
android:enabled="false"
7171
android:exported="true"
7272
android:icon="@mipmap/calendar_1"
@@ -77,7 +77,7 @@
7777
</intent-filter>
7878
</activity-alias>
7979
<activity-alias
80-
android:name=".preferences.Calendar_2"
80+
android:name=".preference_activity.Calendar_2"
8181
android:enabled="false"
8282
android:exported="true"
8383
android:icon="@mipmap/calendar_2"
@@ -88,7 +88,7 @@
8888
</intent-filter>
8989
</activity-alias>
9090
<activity-alias
91-
android:name=".preferences.Calendar_3"
91+
android:name=".preference_activity.Calendar_3"
9292
android:enabled="false"
9393
android:exported="true"
9494
android:icon="@mipmap/calendar_3"
@@ -99,7 +99,7 @@
9999
</intent-filter>
100100
</activity-alias>
101101
<activity-alias
102-
android:name=".preferences.Calendar_4"
102+
android:name=".preference_activity.Calendar_4"
103103
android:enabled="false"
104104
android:exported="true"
105105
android:icon="@mipmap/calendar_4"
@@ -110,7 +110,7 @@
110110
</intent-filter>
111111
</activity-alias>
112112
<activity-alias
113-
android:name=".preferences.Calendar_5"
113+
android:name=".preference_activity.Calendar_5"
114114
android:enabled="false"
115115
android:exported="true"
116116
android:icon="@mipmap/calendar_5"
@@ -121,7 +121,7 @@
121121
</intent-filter>
122122
</activity-alias>
123123
<activity-alias
124-
android:name=".preferences.Calendar_6"
124+
android:name=".preference_activity.Calendar_6"
125125
android:enabled="false"
126126
android:exported="true"
127127
android:icon="@mipmap/calendar_6"
@@ -132,7 +132,7 @@
132132
</intent-filter>
133133
</activity-alias>
134134
<activity-alias
135-
android:name=".preferences.Calendar_7"
135+
android:name=".preference_activity.Calendar_7"
136136
android:enabled="false"
137137
android:exported="true"
138138
android:icon="@mipmap/calendar_7"
@@ -143,7 +143,7 @@
143143
</intent-filter>
144144
</activity-alias>
145145
<activity-alias
146-
android:name=".preferences.Calendar_8"
146+
android:name=".preference_activity.Calendar_8"
147147
android:enabled="false"
148148
android:exported="true"
149149
android:icon="@mipmap/calendar_8"
@@ -154,7 +154,7 @@
154154
</intent-filter>
155155
</activity-alias>
156156
<activity-alias
157-
android:name=".preferences.Calendar_9"
157+
android:name=".preference_activity.Calendar_9"
158158
android:enabled="false"
159159
android:exported="true"
160160
android:icon="@mipmap/calendar_9"
@@ -165,7 +165,7 @@
165165
</intent-filter>
166166
</activity-alias>
167167
<activity-alias
168-
android:name=".preferences.Calendar_10"
168+
android:name=".preference_activity.Calendar_10"
169169
android:enabled="false"
170170
android:exported="true"
171171
android:icon="@mipmap/calendar_10"
@@ -176,7 +176,7 @@
176176
</intent-filter>
177177
</activity-alias>
178178
<activity-alias
179-
android:name=".preferences.Calendar_11"
179+
android:name=".preference_activity.Calendar_11"
180180
android:enabled="false"
181181
android:exported="true"
182182
android:icon="@mipmap/calendar_11"
@@ -187,7 +187,7 @@
187187
</intent-filter>
188188
</activity-alias>
189189
<activity-alias
190-
android:name=".preferences.Calendar_12"
190+
android:name=".preference_activity.Calendar_12"
191191
android:enabled="false"
192192
android:exported="true"
193193
android:icon="@mipmap/calendar_12"
@@ -198,7 +198,7 @@
198198
</intent-filter>
199199
</activity-alias>
200200
<activity-alias
201-
android:name=".preferences.Calendar_13"
201+
android:name=".preference_activity.Calendar_13"
202202
android:enabled="false"
203203
android:exported="true"
204204
android:icon="@mipmap/calendar_13"
@@ -209,7 +209,7 @@
209209
</intent-filter>
210210
</activity-alias>
211211
<activity-alias
212-
android:name=".preferences.Calendar_14"
212+
android:name=".preference_activity.Calendar_14"
213213
android:enabled="false"
214214
android:exported="true"
215215
android:icon="@mipmap/calendar_14"
@@ -220,7 +220,7 @@
220220
</intent-filter>
221221
</activity-alias>
222222
<activity-alias
223-
android:name=".preferences.Calendar_15"
223+
android:name=".preference_activity.Calendar_15"
224224
android:enabled="false"
225225
android:exported="true"
226226
android:icon="@mipmap/calendar_15"
@@ -231,7 +231,7 @@
231231
</intent-filter>
232232
</activity-alias>
233233
<activity-alias
234-
android:name=".preferences.Calendar_16"
234+
android:name=".preference_activity.Calendar_16"
235235
android:enabled="false"
236236
android:exported="true"
237237
android:icon="@mipmap/calendar_16"
@@ -242,7 +242,7 @@
242242
</intent-filter>
243243
</activity-alias>
244244
<activity-alias
245-
android:name=".preferences.Calendar_17"
245+
android:name=".preference_activity.Calendar_17"
246246
android:enabled="false"
247247
android:exported="true"
248248
android:icon="@mipmap/calendar_17"
@@ -253,7 +253,7 @@
253253
</intent-filter>
254254
</activity-alias>
255255
<activity-alias
256-
android:name=".preferences.Calendar_18"
256+
android:name=".preference_activity.Calendar_18"
257257
android:enabled="false"
258258
android:exported="true"
259259
android:icon="@mipmap/calendar_18"
@@ -264,7 +264,7 @@
264264
</intent-filter>
265265
</activity-alias>
266266
<activity-alias
267-
android:name=".preferences.Calendar_19"
267+
android:name=".preference_activity.Calendar_19"
268268
android:enabled="false"
269269
android:exported="true"
270270
android:icon="@mipmap/calendar_19"
@@ -275,7 +275,7 @@
275275
</intent-filter>
276276
</activity-alias>
277277
<activity-alias
278-
android:name=".preferences.Calendar_20"
278+
android:name=".preference_activity.Calendar_20"
279279
android:enabled="false"
280280
android:exported="true"
281281
android:icon="@mipmap/calendar_20"
@@ -286,7 +286,7 @@
286286
</intent-filter>
287287
</activity-alias>
288288
<activity-alias
289-
android:name=".preferences.Calendar_21"
289+
android:name=".preference_activity.Calendar_21"
290290
android:enabled="false"
291291
android:exported="true"
292292
android:icon="@mipmap/calendar_21"
@@ -297,7 +297,7 @@
297297
</intent-filter>
298298
</activity-alias>
299299
<activity-alias
300-
android:name=".preferences.Calendar_22"
300+
android:name=".preference_activity.Calendar_22"
301301
android:enabled="false"
302302
android:exported="true"
303303
android:icon="@mipmap/calendar_22"
@@ -308,7 +308,7 @@
308308
</intent-filter>
309309
</activity-alias>
310310
<activity-alias
311-
android:name=".preferences.Calendar_23"
311+
android:name=".preference_activity.Calendar_23"
312312
android:enabled="false"
313313
android:exported="true"
314314
android:icon="@mipmap/calendar_23"
@@ -319,7 +319,7 @@
319319
</intent-filter>
320320
</activity-alias>
321321
<activity-alias
322-
android:name=".preferences.Calendar_24"
322+
android:name=".preference_activity.Calendar_24"
323323
android:enabled="false"
324324
android:exported="true"
325325
android:icon="@mipmap/calendar_24"
@@ -330,7 +330,7 @@
330330
</intent-filter>
331331
</activity-alias>
332332
<activity-alias
333-
android:name=".preferences.Calendar_25"
333+
android:name=".preference_activity.Calendar_25"
334334
android:enabled="false"
335335
android:exported="true"
336336
android:icon="@mipmap/calendar_25"
@@ -341,7 +341,7 @@
341341
</intent-filter>
342342
</activity-alias>
343343
<activity-alias
344-
android:name=".preferences.Calendar_26"
344+
android:name=".preference_activity.Calendar_26"
345345
android:enabled="false"
346346
android:exported="true"
347347
android:icon="@mipmap/calendar_26"
@@ -352,7 +352,7 @@
352352
</intent-filter>
353353
</activity-alias>
354354
<activity-alias
355-
android:name=".preferences.Calendar_27"
355+
android:name=".preference_activity.Calendar_27"
356356
android:enabled="false"
357357
android:exported="true"
358358
android:icon="@mipmap/calendar_27"
@@ -363,7 +363,7 @@
363363
</intent-filter>
364364
</activity-alias>
365365
<activity-alias
366-
android:name=".preferences.Calendar_28"
366+
android:name=".preference_activity.Calendar_28"
367367
android:enabled="false"
368368
android:exported="true"
369369
android:icon="@mipmap/calendar_28"
@@ -374,7 +374,7 @@
374374
</intent-filter>
375375
</activity-alias>
376376
<activity-alias
377-
android:name=".preferences.Calendar_29"
377+
android:name=".preference_activity.Calendar_29"
378378
android:enabled="false"
379379
android:exported="true"
380380
android:icon="@mipmap/calendar_29"
@@ -385,7 +385,7 @@
385385
</intent-filter>
386386
</activity-alias>
387387
<activity-alias
388-
android:name=".preferences.Calendar_30"
388+
android:name=".preference_activity.Calendar_30"
389389
android:enabled="false"
390390
android:exported="true"
391391
android:icon="@mipmap/calendar_30"

‎app/src/main/kotlin/me/amrbashir/hijriwidget/HijriDate.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@ import android.icu.util.ULocale
55

66
object HijriDate {
77
fun today(prefsManager: PreferencesManager): Calendar {
8-
val locale = ULocale("@calendar=${prefsManager.calendarCalculationMethod.value}")
8+
val calcMethod = prefsManager.calendarCalculationMethod.value.id
9+
val locale = ULocale("@calendar=$calcMethod")
910
val calendar = Calendar.getInstance(locale)
1011

11-
val dayStart = prefsManager.dayStart.value
12-
1312
calendar.add(Calendar.DAY_OF_MONTH, prefsManager.dayOffset.value)
1413

1514
val currentMinutes = calendar[Calendar.HOUR_OF_DAY] * 60 + calendar[Calendar.MINUTE]
1615

17-
if (currentMinutes < dayStart) {
16+
if (currentMinutes < prefsManager.dayStart.value) {
1817
calendar.add(Calendar.DAY_OF_MONTH, -1)
1918
}
2019

‎app/src/main/kotlin/me/amrbashir/hijriwidget/Utils.kt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package me.amrbashir.hijriwidget
33
import android.content.Context
44
import android.content.res.Configuration
55
import android.content.res.Configuration.UI_MODE_NIGHT_YES
6+
import android.icu.text.DateFormat
67
import android.os.Build
78
import androidx.compose.foundation.shape.RoundedCornerShape
89
import androidx.compose.runtime.Composable
@@ -12,6 +13,7 @@ import androidx.glance.GlanceModifier
1213
import androidx.glance.appwidget.cornerRadius
1314
import java.time.LocalTime
1415
import java.time.format.DateTimeFormatter
16+
import java.util.Date
1517

1618
fun Char.isRtl(): Boolean = when (Character.getDirectionality(this)) {
1719
Character.DIRECTIONALITY_RIGHT_TO_LEFT,
@@ -68,3 +70,8 @@ fun Int.formatTime(): String? {
6870
)
6971
return localTime.format(DateTimeFormatter.ofPattern("hh:mm a"))
7072
}
73+
74+
fun getLocalDateTime(date: Long = System.currentTimeMillis()): String {
75+
val dateFormatter = DateFormat.getDateTimeInstance()
76+
return dateFormatter.format(Date(date))
77+
}

0 commit comments

Comments
 (0)