Skip to content

Commit 3ca0f69

Browse files
Hamza417Hamza417
committed
Build151
 - Fixed issues - New clock needle
1 parent 70186a8 commit 3ca0f69

File tree

15 files changed

+87
-31
lines changed

15 files changed

+87
-31
lines changed

‎.idea/misc.xml‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ On top of all the core functionality Positional is a highly polished app and pro
1919
[![Free](https://img.shields.io/badge/Free%20Version-Play%20Store-839192?style=flat&logo=google%20play)](https://play.google.com/store/apps/details?id=app.simple.positional.lite)
2020
[![Full](https://img.shields.io/badge/Full%20Version-Play%20Store-2E86C1?style=flat&logo=google%20play)](https://play.google.com/store/apps/details?id=app.simple.positional)
2121

22-
[![Free](https://img.shields.io/badge/Free%20Version-Github-white?style=flat&logo=github)](https://github.com/Hamza417/Positional/releases/download/Build151/app-lite-release.apk)
23-
[![Full](https://img.shields.io/badge/Full%20Version%20(Requires%20License)-Github-white?style=flat&logo=github)](https://github.com/Hamza417/Positional/releases/download/Build151/app-full-release.apk)
22+
[![Free](https://img.shields.io/badge/Free%20Version-Github-white?style=flat&logo=github)](https://github.com/Hamza417/Positional/releases/download/Build152/app-lite-release.apk)
23+
[![Full](https://img.shields.io/badge/Full%20Version%20(Requires%20License)-Github-white?style=flat&logo=github)](https://github.com/Hamza417/Positional/releases/download/Build152/app-full-release.apk)
2424

2525
[![Intro](https://img.shields.io/youtube/views/34iuIlusrcs?label=Watch%20App%20Intro&logo=Youtube&logoColor=red&style=social)](https://youtu.be/34iuIlusrcs)
2626

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ android {
5050

5151
compileSdkVersion 31
5252

53-
def appVersionCode = 151
53+
def appVersionCode = 152
5454
def appVersionName = "build_${appVersionCode}_targetV1"
5555

5656
defaultConfig {

‎app/src/main/java/app/simple/positional/adapters/miscellaneous/ArtsAdapter.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class ArtsAdapter : RecyclerView.Adapter<ArtsAdapter.Holder>() {
3535
@SuppressLint("SetTextI18n")
3636
override fun onBindViewHolder(holder: Holder, position: Int) {
3737
holder.art.setImageResource(list[position])
38-
holder.count.text = position.toString() + "/" + list.size
38+
holder.count.text = position.plus(1).toString() + "/" + list.size
3939

4040
holder.icon.setImageBitmap(LocationPins.locationsPins[GPSPreferences.getPinSkin()]
4141
.toBitmapKeepingSize(holder.itemView.context, 6, 255).let {

‎app/src/main/java/app/simple/positional/constants/ClockSkinsConstants.kt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ object ClockSkinsConstants {
4141
R.drawable.clock_hollow_needle_hour,
4242
R.drawable.clock_hollow_needle_minute,
4343
R.drawable.clock_hollow_needle_second
44+
),
45+
intArrayOf( // 6
46+
R.drawable.clock_needle_mod_hour,
47+
R.drawable.clock_needle_mod_minute,
48+
R.drawable.clock_needle_mod_seconds
4449
)
4550
)
4651
}

‎app/src/main/java/app/simple/positional/dialogs/gps/GPSMenu.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import app.simple.positional.decorations.ripple.DynamicRippleTextView
1313
import app.simple.positional.decorations.switchview.SwitchView
1414
import app.simple.positional.decorations.views.CustomBottomSheetDialogFragment
1515
import app.simple.positional.preferences.GPSPreferences
16-
import app.simple.positional.util.ViewUtils.gone
1716

1817
class GPSMenu : CustomBottomSheetDialogFragment() {
1918

@@ -93,7 +92,7 @@ class GPSMenu : CustomBottomSheetDialogFragment() {
9392
}
9493

9594
togglePinCustomization.setOnClickListener {
96-
PinCustomization.newInstance()
95+
PinCustomization.newInstance(false)
9796
.show(requireActivity().supportFragmentManager, "pin_customization")
9897
dismiss()
9998
}

‎app/src/main/java/app/simple/positional/dialogs/gps/PinCustomization.kt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,19 +127,16 @@ class PinCustomization : CustomBottomSheetDialogFragment() {
127127
objectAnimator?.cancel()
128128
opacity.clearAnimation()
129129
size.clearAnimation()
130-
if (!requireActivity().isDestroyed) {
130+
if (!requireActivity().isDestroyed && !requireArguments().getBoolean("long_pressed")) {
131131
GPSMenu.newInstance()
132132
.show(parentFragmentManager, "gps_menu")
133133
}
134134
}
135135

136-
override fun onSaveInstanceState(outState: Bundle) {
137-
138-
}
139-
140136
companion object {
141-
fun newInstance(): PinCustomization {
137+
fun newInstance(longPressed: Boolean): PinCustomization {
142138
val args = Bundle()
139+
args.putBoolean("long_pressed", longPressed)
143140
val fragment = PinCustomization()
144141
fragment.arguments = args
145142
return fragment

‎app/src/main/java/app/simple/positional/extensions/activity/BaseActivity.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ import androidx.appcompat.app.AppCompatActivity
1111
import androidx.appcompat.app.AppCompatDelegate
1212
import androidx.core.content.ContextCompat
1313
import androidx.core.os.ConfigurationCompat
14-
import app.simple.positional.BuildConfig
1514
import app.simple.positional.R
1615
import app.simple.positional.preferences.ClockPreferences
1716
import app.simple.positional.preferences.CompassPreferences
17+
import app.simple.positional.preferences.GPSPreferences
1818
import app.simple.positional.preferences.MainPreferences
1919
import app.simple.positional.singleton.SharedPreferences
20+
import app.simple.positional.util.AppUtils
2021
import app.simple.positional.util.ContextUtils
2122
import app.simple.positional.util.LocaleHelper
2223
import app.simple.positional.util.ThemeSetter
@@ -74,7 +75,7 @@ open class BaseActivity : AppCompatActivity() {
7475
*/
7576
LocaleHelper.setAppLocale(ConfigurationCompat.getLocales(resources.configuration)[0])
7677

77-
if (BuildConfig.FLAVOR == "lite") {
78+
if (AppUtils.isLiteFlavor()) {
7879
resetLitePrefs()
7980
}
8081

@@ -85,6 +86,7 @@ open class BaseActivity : AppCompatActivity() {
8586
CompassPreferences.setFlowerBloom(false)
8687
ClockPreferences.setClockNeedleTheme(1)
8788
MainPreferences.setCustomCoordinates(false)
89+
GPSPreferences.setPinSkin(0)
8890
}
8991

9092
private fun setTheme() {

‎app/src/main/java/app/simple/positional/ui/panels/GPS.kt‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,11 @@ import androidx.lifecycle.lifecycleScope
2424
import androidx.room.Room
2525
import androidx.transition.TransitionInflater
2626
import androidx.transition.TransitionManager
27-
import app.simple.positional.BuildConfig
2827
import app.simple.positional.R
2928
import app.simple.positional.callbacks.BottomSheetSlide
3029
import app.simple.positional.constants.LocationPins
3130
import app.simple.positional.database.instances.LocationDatabase
32-
import app.simple.positional.decorations.corners.DynamicCornerLinearLayout
3331
import app.simple.positional.decorations.maps.*
34-
import app.simple.positional.decorations.ripple.DynamicRippleConstraintLayout
3532
import app.simple.positional.decorations.ripple.DynamicRippleLinearLayout
3633
import app.simple.positional.dialogs.app.ErrorDialog
3734
import app.simple.positional.dialogs.app.LocationParameters
@@ -127,8 +124,7 @@ class GPS : ScopedFragment() {
127124
save = view.findViewById(R.id.gps_save)
128125
crossHair = view.findViewById(R.id.cross_hair)
129126
expandUp = view.findViewById(R.id.expand_up_gps_sheet)
130-
bottomSheetInfoPanel =
131-
BottomSheetBehavior.from(view.findViewById(R.id.gps_info_bottom_sheet))
127+
bottomSheetInfoPanel = BottomSheetBehavior.from(view.findViewById(R.id.gps_info_bottom_sheet))
132128

133129
locationBox = view.findViewById(R.id.gps_panel_location)
134130
targetBox = view.findViewById(R.id.gps_panel_target)
@@ -199,7 +195,7 @@ class GPS : ScopedFragment() {
199195
setLocationPin()
200196
targetMode()
201197

202-
if(AppUtils.isLiteFlavor()) save.gone()
198+
if (AppUtils.isLiteFlavor()) save.gone()
203199

204200
if (isCustomCoordinate) {
205201
specifiedLocationTextView.isVisible = true
@@ -281,7 +277,7 @@ class GPS : ScopedFragment() {
281277
} else {
282278
fromHtml("<b>${getString(R.string.gps_speed)}</b> ${
283279
round(location!!.speed.toDouble().toKiloMetersPerHour()
284-
.toMilesPerHour(), 2)
280+
.toMilesPerHour(), 2)
285281
} ${getString(R.string.miles_hour)}")
286282
}
287283

@@ -323,8 +319,8 @@ class GPS : ScopedFragment() {
323319

324320
locationViewModel.latency.observe(viewLifecycleOwner, {
325321
val str: Spannable = fromHtml("<b>${getString(R.string.gps_latency)}</b> " +
326-
"${it.first} " +
327-
if (it.second) getString(R.string.seconds) else getString(R.string.milliseconds)).toSpannable()
322+
"${it.first} " +
323+
if (it.second) getString(R.string.seconds) else getString(R.string.milliseconds)).toSpannable()
328324

329325
if (it.second) {
330326
if (it.first.toDouble() > 5.0) {
@@ -408,8 +404,10 @@ class GPS : ScopedFragment() {
408404
}
409405

410406
override fun onCustomLocationLongPressed(view: View) {
411-
PinCustomization.newInstance()
412-
.show(parentFragmentManager, "pin_customization")
407+
if (AppUtils.isFullFlavor()) {
408+
PinCustomization.newInstance(true)
409+
.show(parentFragmentManager, "pin_customization")
410+
}
413411
}
414412
})
415413

@@ -786,7 +784,7 @@ class GPS : ScopedFragment() {
786784
.inflateTransition(R.transition.tools_transition))
787785

788786
val params = CoordinatorLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
789-
ViewGroup.LayoutParams.WRAP_CONTENT)
787+
ViewGroup.LayoutParams.WRAP_CONTENT)
790788

791789
params.apply {
792790
gravity = if (GPSPreferences.isToolsGravityLeft()) {
@@ -844,4 +842,4 @@ class GPS : ScopedFragment() {
844842
return fragment
845843
}
846844
}
847-
}
845+
}

‎app/src/main/java/app/simple/positional/util/AppUtils.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,8 @@ object AppUtils {
88
return BuildConfig.FLAVOR == "lite"
99
}
1010

11+
fun isFullFlavor() : Boolean {
12+
return BuildConfig.FLAVOR == "full"
13+
}
14+
1115
}

0 commit comments

Comments
 (0)