Skip to content

Commit

Permalink
Updates the plugin update check mechanism
Browse files Browse the repository at this point in the history
  • Loading branch information
@kelsos
kelsos committed May 7, 2021
1 parent 5bc9e9b commit 3aacc52
Show file tree
Hide file tree
Showing 15 changed files with 307 additions and 136 deletions.
138 changes: 69 additions & 69 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,118 +4,109 @@
package="com.kelsos.mbrc"
android:installLocation="auto">

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>

<uses-sdk tools:overrideLibrary="timber.log" />

<application
android:name=".RemoteApplication"
android:allowBackup="true"
android:description="@string/application_description"
android:icon="@mipmap/ic_launcher"
android:label="@string/application_name"
android:logo="@mipmap/ic_launcher"
android:theme="@style/Theme.App"
tools:ignore="UnusedAttribute">
android:name=".RemoteApplication"
android:allowBackup="true"
android:description="@string/application_description"
android:icon="@mipmap/ic_launcher"
android:label="@string/application_name"
android:logo="@mipmap/ic_launcher"
android:theme="@style/Theme.App"
tools:ignore="UnusedAttribute">
<activity
android:name=".UpdateRequiredActivity"
android:exported="true" />
<activity
android:name=".ui.navigation.main.MainActivity"
android:launchMode="singleTop"
android:windowSoftInputMode="adjustNothing" />
android:name=".ui.navigation.main.MainActivity"
android:launchMode="singleTop"
android:windowSoftInputMode="adjustNothing" />
<activity
android:name=".ui.navigation.library.LibraryActivity"
android:label="@string/nav_library"
android:parentActivityName=".ui.navigation.main.MainActivity">
android:name=".ui.navigation.library.LibraryActivity"
android:label="@string/nav_library"
android:parentActivityName=".ui.navigation.main.MainActivity">

<!-- Parent activity meta-data to support 4.0 and lower -->
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.navigation.main.MainActivity" />
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.navigation.main.MainActivity" />
</activity>
<activity android:name=".ui.navigation.library.album_tracks.AlbumTracksActivity"/>
<activity android:name=".ui.navigation.library.artist_albums.ArtistAlbumsActivity"/>
<activity android:name=".ui.navigation.library.genre_artists.GenreArtistsActivity"/>
<activity android:name=".ui.navigation.library.album_tracks.AlbumTracksActivity" />
<activity android:name=".ui.navigation.library.artist_albums.ArtistAlbumsActivity" />
<activity android:name=".ui.navigation.library.genre_artists.GenreArtistsActivity" />
<activity
android:name=".ui.navigation.lyrics.LyricsActivity"
android:label="@string/nav_lyrics"
android:parentActivityName=".ui.navigation.main.MainActivity">
android:name=".ui.navigation.lyrics.LyricsActivity"
android:label="@string/nav_lyrics"
android:parentActivityName=".ui.navigation.main.MainActivity">

<!-- Parent activity meta-data to support 4.0 and lower -->
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.navigation.main.MainActivity" />
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.navigation.main.MainActivity" />
</activity>
<activity
android:name=".ui.navigation.nowplaying.NowPlayingActivity"
android:label="@string/nav_now_playing"
android:parentActivityName=".ui.navigation.main.MainActivity">
android:name=".ui.navigation.nowplaying.NowPlayingActivity"
android:label="@string/nav_now_playing"
android:parentActivityName=".ui.navigation.main.MainActivity">

<!-- Parent activity meta-data to support 4.0 and lower -->
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.navigation.main.MainActivity" />
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.navigation.main.MainActivity" />
</activity>
<activity
android:name=".ui.navigation.playlists.PlaylistActivity"
android:label="@string/nav_playlists"
android:parentActivityName=".ui.navigation.main.MainActivity">
android:name=".ui.navigation.playlists.PlaylistActivity"
android:label="@string/nav_playlists"
android:parentActivityName=".ui.navigation.main.MainActivity">

<!-- Parent activity meta-data to support 4.0 and lower -->
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.navigation.main.MainActivity" />
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.navigation.main.MainActivity" />
</activity>
<activity
android:name=".ui.preferences.SettingsActivity"
android:parentActivityName=".ui.navigation.main.MainActivity">
android:name=".ui.preferences.SettingsActivity"
android:parentActivityName=".ui.navigation.main.MainActivity">

<!-- Parent activity meta-data to support 4.0 and lower -->
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.navigation.main.MainActivity" />
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.navigation.main.MainActivity" />
</activity>
<activity
android:name=".ui.connection_manager.ConnectionManagerActivity"
android:parentActivityName=".ui.preferences.SettingsActivity"
android:windowSoftInputMode="adjustNothing">
android:name=".ui.connection_manager.ConnectionManagerActivity"
android:parentActivityName=".ui.preferences.SettingsActivity"
android:windowSoftInputMode="adjustNothing">

<!-- Parent activity meta-data to support 4.0 and lower -->
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.preferences.SettingsActivity" />
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.preferences.SettingsActivity" />
</activity>

<activity
android:name=".ui.help_feedback.HelpFeedbackActivity"
android:label="@string/title_activity_help_feedback"
android:windowSoftInputMode="adjustNothing"
android:parentActivityName=".ui.navigation.main.MainActivity">
android:name=".ui.help_feedback.HelpFeedbackActivity"
android:label="@string/title_activity_help_feedback"
android:parentActivityName=".ui.navigation.main.MainActivity"
android:windowSoftInputMode="adjustNothing">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.kelsos.mbrc.ui.navigation.main.MainActivity" />
</activity>

<activity
android:name=".ui.activities.SplashActivity"
android:name=".ui.activities.SplashActivity"
android:noHistory="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity
android:label="@string/title_activity_radios"
android:name=".ui.navigation.radio.RadioActivity"
android:parentActivityName="com.kelsos.mbrc.ui.navigation.main.MainActivity">
android:label="@string/title_activity_radios"
android:parentActivityName=".ui.navigation.main.MainActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.kelsos.mbrc.ui.navigation.main.MainActivity"/>
android:value="com.kelsos.mbrc.ui.navigation.main.MainActivity" />
</activity>

<receiver android:name=".utilities.MediaButtonReceiver">
Expand All @@ -129,22 +120,22 @@
</intent-filter>

<meta-data
android:name="android.appwidget.provider"
android:resource="@xml/remote_widget_small" />
android:name="android.appwidget.provider"
android:resource="@xml/remote_widget_small" />
</receiver>
<receiver android:name=".widgets.WidgetNormal">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
</intent-filter>

<meta-data
android:name="android.appwidget.provider"
android:resource="@xml/remote_widget_normal" />
android:name="android.appwidget.provider"
android:resource="@xml/remote_widget_normal" />
</receiver>

<service
android:name=".controller.RemoteService"
android:description="@string/info_service_description"
android:name=".controller.RemoteService"
android:description="@string/info_service_description"
android:exported="false">
<intent-filter>
<action android:name="android.net.wifi.STATE_CHANGE" />
Expand All @@ -156,4 +147,13 @@
</service>
</application>

<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

<uses-sdk tools:overrideLibrary="timber.log" />

</manifest>
39 changes: 39 additions & 0 deletions app/src/main/java/com/kelsos/mbrc/UpdateRequiredActivity.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.kelsos.mbrc

import android.os.Bundle
import android.view.View
import android.view.Window
import android.widget.Button
import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity
import com.google.android.material.transition.platform.MaterialContainerTransform
import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback

class UpdateRequiredActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {

window.requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS)
findViewById<View>(android.R.id.content).transitionName = "shared_element_container"
setEnterSharedElementCallback(MaterialContainerTransformSharedElementCallback())
window.sharedElementEnterTransition = MaterialContainerTransform().apply {
addTarget(android.R.id.content)
duration = 300L
}
window.sharedElementReturnTransition = MaterialContainerTransform().apply {
addTarget(android.R.id.content)
duration = 250L
}
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_update_required)
val version = intent.getStringExtra(VERSION)
val text = getString(R.string.plugin_update__description, version)
findViewById<TextView>(R.id.main_update_text).text = text
findViewById<Button>(R.id.main_update_ok).setOnClickListener {
finish()
}
}

companion object {
const val VERSION: String = "version"
}
}
Loading

0 comments on commit 3aacc52

Please sign in to comment.