Skip to content

Commit 59d5a12

Browse files
hardalgorithmhardalgorithm
committed
polished build
1 parent 0f9c0ae commit 59d5a12

File tree

5 files changed

+18
-48
lines changed

5 files changed

+18
-48
lines changed

‎app/build.gradle.kts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ android {
1313
applicationId = "com.paranoid.privacylock"
1414
minSdk = 28
1515
targetSdk = 35
16-
versionCode = 8
17-
versionName = "v1.1.8"
16+
versionCode = 9
17+
versionName = "v1.1.9"
1818
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1919
}
2020

@@ -79,7 +79,6 @@ dependencies {
7979
//Dagger - Hilt
8080
implementation("com.google.dagger:hilt-android:2.48")
8181
kapt("com.google.dagger:hilt-android-compiler:2.46")
82-
//implementation ("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10") // Use the latest stable version
8382

8483
//Splash Screen androidX
8584
implementation ("androidx.core:core-splashscreen:1.0.1")

‎app/src/main/java/com/paranoid/privacylock/ui/settings/SettingFragment.kt‎

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -39,34 +39,24 @@ class SettingFragment : Fragment() {
3939
private val settingViewModel: SettingViewModel by viewModels()
4040
private val gestureInterpolator = PathInterpolatorCompat.create(0f, 0f, 0f, 1f)
4141

42-
override fun onCreate(savedInstanceState: Bundle?) {
43-
super.onCreate(savedInstanceState)
44-
45-
}
46-
4742
override fun onCreateView(
4843
inflater: LayoutInflater, container: ViewGroup?,
4944
savedInstanceState: Bundle?
5045
): View {
5146
_binding = FragmentSettingBinding.inflate(inflater, container, false)
5247
return binding.root
53-
54-
5548
}
5649

5750
@SuppressLint("ClickableViewAccessibility")
5851
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
5952
super.onViewCreated(view, savedInstanceState)
6053

61-
// Predictive Back with fragments
6254
val predictiveBackMargin = resources.getDimensionPixelSize(R.dimen.predictive_back_margin)
6355
var initialTouchY = -1f
6456
requireActivity().onBackPressedDispatcher.addCallback(
6557
viewLifecycleOwner,
6658
object : OnBackPressedCallback(true) {
6759
override fun handleOnBackPressed() {
68-
// This invokes the sharedElementReturnTransition, which is
69-
// MaterialContainerTransform.
7060
findNavController().popBackStack()
7161
}
7262

@@ -112,23 +102,23 @@ class SettingFragment : Fragment() {
112102
)
113103
)
114104

115-
binding.dayNightToggle.setTrackTintList(trackStates)
116-
binding.dayNightToggle2.setTrackTintList(trackStates)
105+
binding.hapticFeedbackToggle.setTrackTintList(trackStates)
106+
binding.shakeLockToggle.setTrackTintList(trackStates)
117107

118-
val defaultSwitchColor = binding.dayNightToggle.thumbTintList
108+
val defaultSwitchColor = binding.hapticFeedbackToggle.thumbTintList
119109

120-
binding.dayNightToggle.setupThumbTint(R.color.orange, defaultSwitchColor)
121-
binding.dayNightToggle2.setupThumbTint(R.color.orange, defaultSwitchColor)
110+
binding.hapticFeedbackToggle.setupThumbTint(R.color.orange, defaultSwitchColor)
111+
binding.shakeLockToggle.setupThumbTint(R.color.orange, defaultSwitchColor)
122112

123113
settingViewModel.isToggleChecked.observe(viewLifecycleOwner) { isChecked ->
124-
binding.dayNightToggle2.isChecked = isChecked
114+
binding.shakeLockToggle.isChecked = isChecked
125115
}
126116

127117
settingViewModel.isToggleVibrateChecked.observe(viewLifecycleOwner) { isChecked ->
128-
binding.dayNightToggle.isChecked = isChecked
118+
binding.hapticFeedbackToggle.isChecked = isChecked
129119
}
130120

131-
binding.dayNightToggle.setOnCheckedChangeListener { _, isChecked ->
121+
binding.hapticFeedbackToggle.setOnCheckedChangeListener { _, isChecked ->
132122
if (!settingViewModel.getToggleVibrateChecked()){
133123
val vibrator = requireContext().getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
134124
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
@@ -144,7 +134,7 @@ class SettingFragment : Fragment() {
144134
settingViewModel.saveToggleVibrateChecked(isChecked)
145135
}
146136

147-
binding.dayNightToggle2.setOnCheckedChangeListener { _, isChecked ->
137+
binding.shakeLockToggle.setOnCheckedChangeListener { _, isChecked ->
148138
if (settingViewModel.getToggleVibrateChecked()){
149139
val vibrator = requireContext().getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
150140
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
@@ -173,7 +163,6 @@ class SettingFragment : Fragment() {
173163
binding.seekBar.progress = progress
174164
}
175165

176-
177166
binding.seekBar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener{
178167
override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
179168
if (settingViewModel.getToggleVibrateChecked()){
@@ -194,8 +183,7 @@ class SettingFragment : Fragment() {
194183
override fun onStopTrackingTouch(seekBar: SeekBar) {}
195184
})
196185

197-
198-
binding.materialCardView4.setOnClickListener {
186+
binding.aboutUsCard.setOnClickListener {
199187
if (settingViewModel.getToggleVibrateChecked()){
200188
val vibrator = requireContext().getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
201189

‎app/src/main/res/layout-land/fragment_setting.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
</androidx.appcompat.widget.LinearLayoutCompat>
158158

159159
<com.google.android.material.materialswitch.MaterialSwitch
160-
android:id="@+id/dayNightToggle"
160+
android:id="@+id/hapticFeedbackToggle"
161161
android:layout_width="wrap_content"
162162
android:layout_height="wrap_content"
163163
android:layout_margin="8dp"
@@ -220,7 +220,7 @@
220220
</androidx.appcompat.widget.LinearLayoutCompat>
221221

222222
<com.google.android.material.materialswitch.MaterialSwitch
223-
android:id="@+id/dayNightToggle2"
223+
android:id="@+id/shakeLockToggle"
224224
android:layout_width="wrap_content"
225225
android:layout_height="wrap_content"
226226
android:layout_margin="8dp"
@@ -278,7 +278,7 @@
278278

279279

280280
<com.google.android.material.card.MaterialCardView
281-
android:id="@+id/materialCardView4"
281+
android:id="@+id/aboutUsCard"
282282
style="@style/Widget.Material3.CardView.Filled"
283283
android:layout_width="match_parent"
284284
android:layout_height="wrap_content"

‎app/src/main/res/layout/fragment_setting.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@
256256
</androidx.appcompat.widget.LinearLayoutCompat>
257257

258258
<com.google.android.material.materialswitch.MaterialSwitch
259-
android:id="@+id/dayNightToggle"
259+
android:id="@+id/hapticFeedbackToggle"
260260
android:layout_width="wrap_content"
261261
android:layout_height="wrap_content"
262262
android:layout_margin="8dp"
@@ -319,7 +319,7 @@
319319
</androidx.appcompat.widget.LinearLayoutCompat>
320320

321321
<com.google.android.material.materialswitch.MaterialSwitch
322-
android:id="@+id/dayNightToggle2"
322+
android:id="@+id/shakeLockToggle"
323323
android:layout_width="wrap_content"
324324
android:layout_height="wrap_content"
325325
android:layout_margin="8dp"
@@ -377,7 +377,7 @@
377377

378378

379379
<com.google.android.material.card.MaterialCardView
380-
android:id="@+id/materialCardView4"
380+
android:id="@+id/aboutUsCard"
381381
style="@style/Widget.Material3.CardView.Filled"
382382
android:layout_width="match_parent"
383383
android:layout_height="wrap_content"

‎app/src/test/java/com/paranoid/privacylock/ExampleUnitTest.kt‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)