Madeorsk/SpotiFlyer
1
0
Fork 0
mirror of https://github.com/Shabinder/SpotiFlyer.git synced 2024-11-26 10:24:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug Fixes and Version Bump

Browse Source
This commit is contained in:
shabinder 2021-01-02 19:35:31 +05:30
parent e056344d28
commit da9ab5df64
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -22,8 +22,8 @@ android {
applicationId "com.shabinder.spotiflyer" applicationId "com.shabinder.spotiflyer"
minSdkVersion 22 minSdkVersion 22
targetSdkVersion 30 targetSdkVersion 30
versionCode 1 versionCode 12
versionName "1.0" versionName "2.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

8
app/src/main/java/com/shabinder/spotiflyer/MainActivity.kt
View File

@ -113,7 +113,7 @@ class MainActivity : AppCompatActivity(), PaymentResultListener {
private fun checkIfLatestVersion() { private fun checkIfLatestVersion() {
AppUpdater(this,0).run { AppUpdater(this,0).run {
setDisplay(Display.NOTIFICATION) setDisplay(Display.NOTIFICATION)
showAppUpdated(true)//true:Show App is Updated Dialog showAppUpdated(false)//true:Show App is Updated Dialog
setUpdateFrom(UpdateFrom.XML) setUpdateFrom(UpdateFrom.XML)
setUpdateXML("https://raw.githubusercontent.com/Shabinder/SpotiFlyer/master/app/src/main/res/xml/app_update.xml") setUpdateXML("https://raw.githubusercontent.com/Shabinder/SpotiFlyer/master/app/src/main/res/xml/app_update.xml")
setCancelable(false) setCancelable(false)
@ -280,15 +280,15 @@ fun AppBar(
) )
} }
}, },
actions = { /*actions = {
Providers(AmbientContentAlpha provides ContentAlpha.medium) { Providers(AmbientContentAlpha provides ContentAlpha.medium) {
IconButton( IconButton(
onClick = { /* TODO: Open Preferences*/ } onClick = { *//* TODO: Open Preferences*//* }
) { ) {
Icon(Icons.Filled.Settings, tint = Color.Gray) Icon(Icons.Filled.Settings, tint = Color.Gray)
} }
} }
}, },*/
modifier = modifier, modifier = modifier,
elevation = 0.dp elevation = 0.dp
) )

14
app/src/main/java/com/shabinder/spotiflyer/ui/home/Home.kt
View File

@ -38,10 +38,7 @@ import com.shabinder.spotiflyer.navigation.navigateToTrackList
import com.shabinder.spotiflyer.ui.SpotiFlyerTypography import com.shabinder.spotiflyer.ui.SpotiFlyerTypography
import com.shabinder.spotiflyer.ui.colorAccent import com.shabinder.spotiflyer.ui.colorAccent
import com.shabinder.spotiflyer.ui.colorPrimary import com.shabinder.spotiflyer.ui.colorPrimary
import com.shabinder.spotiflyer.utils.mainActivity import com.shabinder.spotiflyer.utils.*
import com.shabinder.spotiflyer.utils.openPlatform
import com.shabinder.spotiflyer.utils.sharedViewModel
import com.shabinder.spotiflyer.utils.showDialog
import dev.chrisbanes.accompanist.coil.CoilImage import dev.chrisbanes.accompanist.coil.CoilImage
import org.json.JSONObject import org.json.JSONObject
@ -273,7 +270,8 @@ fun DownloadRecordItem(item: DownloadRecord,navController: NavController) {
Image( Image(
imageVector = vectorResource(id = R.drawable.ic_share_open), imageVector = vectorResource(id = R.drawable.ic_share_open),
modifier = Modifier.clickable(onClick = { modifier = Modifier.clickable(onClick = {
navController.navigateToTrackList(item.link) if(!isOnline()) showDialog("Check Your Internet Connection")
else navController.navigateToTrackList(item.link)
}) })
) )
} }
@ -395,7 +393,11 @@ fun SearchPanel(
OutlinedButton( OutlinedButton(
modifier = Modifier.padding(12.dp).wrapContentWidth(), modifier = Modifier.padding(12.dp).wrapContentWidth(),
onClick = { onClick = {
navController.navigateToTrackList(link) if(link.isBlank()) showDialog("Enter A Link!")
else{
if(!isOnline()) showDialog("Check Your Internet Connection")
else navController.navigateToTrackList(link)
}
}, },
border = BorderStroke(1.dp, Brush.horizontalGradient(listOf(colorPrimary, colorAccent))) border = BorderStroke(1.dp, Brush.horizontalGradient(listOf(colorPrimary, colorAccent)))
){ ){