Skip to content
This repository has been archived by the owner on Aug 27, 2024. It is now read-only.

Commit

Permalink
updated copyright date info
Browse files Browse the repository at this point in the history
  • Loading branch information
y20k committed Jan 1, 2021
1 parent 5a3e538 commit bfbbd5e
Show file tree
Hide file tree
Showing 45 changed files with 113 additions and 84 deletions.
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
The MIT License (MIT)
=====================

Copyright (c) 2015-20 - Y20K.org
Copyright (c) 2015-21 - Y20K.org
--------------------------------

Permission is hereby granted, free of charge, to any person obtaining a copy
Expand All @@ -20,4 +20,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE.
2 changes: 1 addition & 1 deletion app/src/main/java/org/y20k/transistor/Keys.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down
20 changes: 19 additions & 1 deletion app/src/main/java/org/y20k/transistor/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
/*
* MainActivity.kt
* Implements the MainActivity class
* MainActivity is the default activity that can host the player fragment and the settings fragment
*
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/


package org.y20k.transistor

import android.content.Context
Expand All @@ -16,6 +30,10 @@ import org.y20k.transistor.helpers.FileHelper
import org.y20k.transistor.helpers.LogHelper
import org.y20k.transistor.helpers.PreferencesHelper


/*
* MainActivity class
*/
class MainActivity: AppCompatActivity() {

/* Define log tag */
Expand Down Expand Up @@ -79,4 +97,4 @@ class MainActivity: AppCompatActivity() {



}
}
2 changes: 1 addition & 1 deletion app/src/main/java/org/y20k/transistor/PlayerFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/y20k/transistor/PlayerService.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -849,4 +849,4 @@ class PlayerService(): MediaBrowserServiceCompat(), Player.EventListener, Metada
}
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -50,4 +50,4 @@ class PlayerServiceStarterActivity: Activity() {
startService(startIntent)
}

}
}
8 changes: 3 additions & 5 deletions app/src/main/java/org/y20k/transistor/SettingsFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -211,9 +211,7 @@ class SettingsFragment: PreferenceFragmentCompat(), YesNoDialog.YesNoDialogListe
if (NetworkHelper.isConnectedToNetwork(activity as Context)) {
Toast.makeText(activity as Context, R.string.toastmessage_updating_collection, Toast.LENGTH_LONG).show()
// update collection in player screen
val bundle: Bundle = bundleOf(
Keys.ARG_UPDATE_COLLECTION to true
)
val bundle: Bundle = bundleOf(Keys.ARG_UPDATE_COLLECTION to true)
this.findNavController().navigate(R.id.player_destination, bundle)
} else {
ErrorDialog().show(activity as Context, R.string.dialog_error_title_no_network, R.string.dialog_error_message_no_network)
Expand All @@ -236,4 +234,4 @@ class SettingsFragment: PreferenceFragmentCompat(), YesNoDialog.YesNoDialogListe
}


}
}
4 changes: 2 additions & 2 deletions app/src/main/java/org/y20k/transistor/Transistor.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -44,4 +44,4 @@ class Transistor: Application () {
LogHelper.v(TAG, "Transistor application terminated.")
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -491,4 +491,4 @@ class CollectionAdapter(private val context: Context, private val collectionAdap
/*
* End of inner class
*/
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -97,4 +97,4 @@ class CollectionViewModel(application: Application) : AndroidViewModel(applicati
}
}

}
}
4 changes: 2 additions & 2 deletions app/src/main/java/org/y20k/transistor/core/Collection.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -51,4 +51,4 @@ data class Collection(@Expose val version: Int = Keys.CURRENT_COLLECTION_CLASS_V
modificationDate = modificationDate)
}

}
}
4 changes: 2 additions & 2 deletions app/src/main/java/org/y20k/transistor/core/Station.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -95,4 +95,4 @@ data class Station (@Expose val uuid: String = UUID.randomUUID().toString(),
radioBrowserStationUuid = radioBrowserStationUuid,
radioBrowserChangeUuid = radioBrowserChangeUuid)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/y20k/transistor/dialogs/ErrorDialog.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -85,4 +85,4 @@ class ErrorDialog {
// display error dialog
builder.show()
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -241,4 +241,4 @@ class FindStationDialog (private var context: Context, private var listener: Fin
noSearchResultsTextView.isGone = true
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -76,4 +76,4 @@ interface RenameStationListener {
builder.show()
}

}
}
6 changes: 3 additions & 3 deletions app/src/main/java/org/y20k/transistor/dialogs/YesNoDialog.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -50,7 +50,7 @@ class YesNoDialog (private var yesNoDialogListener: YesNoDialogListener) {
show(context, type, title, context.getString(message), yesButton, noButton, payload, payloadString)
}


/* Construct and show dialog */
fun show(context: Context,
type: Int,
Expand Down Expand Up @@ -91,4 +91,4 @@ class YesNoDialog (private var yesNoDialogListener: YesNoDialogListener) {
// display dialog
builder.show()
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand All @@ -21,4 +21,4 @@ fun ArrayList<Long>.copy(): ArrayList<Long> {
val copy: ArrayList<Long> = ArrayList<Long>()
this.forEach { copy.add(it) }
return copy
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -98,4 +98,4 @@ object AppThemeHelper {



}
}
4 changes: 2 additions & 2 deletions app/src/main/java/org/y20k/transistor/helpers/AudioHelper.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -42,4 +42,4 @@ object AudioHelper {
return duration
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file is part of
* TRANSISTOR - Radio App for Android
*
* Copyright (c) 2015-20 - Y20K.org
* Copyright (c) 2015-21 - Y20K.org
* Licensed under the MIT-License
* http://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -176,8 +176,10 @@ object CollectionHelper {
// all clear -> add station
else {
var updatedCollection: Collection = collection
val updatedStationList: MutableList<Station> = collection.stations.toMutableList()
// add station
updatedCollection.stations.add(newStation)
updatedStationList.add(newStation)
updatedCollection.stations = updatedStationList
// sort and save collection
updatedCollection = sortCollection(updatedCollection)
saveCollection(context, updatedCollection, false)
Expand Down Expand Up @@ -454,4 +456,4 @@ object CollectionHelper {
return gson.fromJson(result, Array<RadioBrowserResult>::class.java)
}

}
}
Loading

0 comments on commit bfbbd5e

Please sign in to comment.