diff --git a/app/src/main/java/com/yoesuv/infomadiun/main/views/SplashActivity.kt b/app/src/main/java/com/yoesuv/infomadiun/main/views/SplashActivity.kt index af0a55c..28be300 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/main/views/SplashActivity.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/main/views/SplashActivity.kt @@ -10,7 +10,7 @@ import com.yoesuv.infomadiun.databinding.ActivitySplashBinding import com.yoesuv.infomadiun.main.viewmodels.SplashViewModel @SuppressLint("CustomSplashScreen") -class SplashActivity: AppCompatActivity() { +class SplashActivity : AppCompatActivity() { private lateinit var binding: ActivitySplashBinding private lateinit var viewModel: SplashViewModel diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/gallery/adapters/GalleryAdapter.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/gallery/adapters/GalleryAdapter.kt index 2889e5c..a37702d 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/gallery/adapters/GalleryAdapter.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/gallery/adapters/GalleryAdapter.kt @@ -9,7 +9,8 @@ import com.yoesuv.infomadiun.utils.AdapterCallback /** * Updated by yusuf on 26 July 2020. */ -class GalleryAdapter(val onItemClick:(galleryModel: GalleryModel) -> Unit): ListAdapter(AdapterCallback.diffGalleryCallback) { +class GalleryAdapter(val onItemClick: (galleryModel: GalleryModel) -> Unit) : + ListAdapter(AdapterCallback.diffGalleryCallback) { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GalleryViewHolder { return GalleryViewHolder.from(parent) diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/gallery/models/GalleryModel.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/gallery/models/GalleryModel.kt index e068d51..d94c825 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/gallery/models/GalleryModel.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/gallery/models/GalleryModel.kt @@ -15,8 +15,8 @@ import kotlinx.parcelize.Parcelize @Entity(tableName = "galleries") @Parcelize data class GalleryModel( - @PrimaryKey(autoGenerate = true) val id: Int, - @SerializedName("caption") @Expose val caption:String?, - @SerializedName("thumbnail") @Expose val thumbnail:String?, - @SerializedName("image") @Expose val image:String? -): Parcelable \ No newline at end of file + @PrimaryKey(autoGenerate = true) val id: Int, + @SerializedName("caption") @Expose val caption: String?, + @SerializedName("thumbnail") @Expose val thumbnail: String?, + @SerializedName("image") @Expose val image: String? +) : Parcelable \ No newline at end of file diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/gallery/viewmodels/ItemGalleryViewModel.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/gallery/viewmodels/ItemGalleryViewModel.kt index b57a7fb..016f56f 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/gallery/viewmodels/ItemGalleryViewModel.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/gallery/viewmodels/ItemGalleryViewModel.kt @@ -4,6 +4,6 @@ import androidx.lifecycle.ViewModel import androidx.databinding.ObservableField import com.yoesuv.infomadiun.menu.gallery.models.GalleryModel -class ItemGalleryViewModel(galleryModel: GalleryModel): ViewModel() { +class ItemGalleryViewModel(galleryModel: GalleryModel) : ViewModel() { var imageUrl: ObservableField = ObservableField(galleryModel.thumbnail) } \ No newline at end of file diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/adapters/ListPlaceAdapter.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/adapters/ListPlaceAdapter.kt index 1ed5130..7807f8b 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/adapters/ListPlaceAdapter.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/adapters/ListPlaceAdapter.kt @@ -9,7 +9,7 @@ import com.yoesuv.infomadiun.utils.AdapterCallback /** * Updated by yusuf on 26 July 2020. */ -class ListPlaceAdapter(val onItemClick:(PlaceModel) -> Unit): ListAdapter(AdapterCallback.diffPlaceCallback) { +class ListPlaceAdapter(val onItemClick: (PlaceModel) -> Unit) : ListAdapter(AdapterCallback.diffPlaceCallback) { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PlaceViewHolder { return PlaceViewHolder.from(parent) diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/models/PlaceModel.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/models/PlaceModel.kt index 5ed8588..fc07e90 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/models/PlaceModel.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/models/PlaceModel.kt @@ -15,10 +15,11 @@ import kotlinx.parcelize.Parcelize @Entity(tableName = "places") @Parcelize data class PlaceModel( - @PrimaryKey(autoGenerate = true) val id: Int, - @SerializedName("nama") @Expose val name:String?, - @SerializedName("lokasi") @Expose val location:String?, - @SerializedName("kategori") @Expose val category:String?, - @SerializedName("deskripsi") @Expose val description:String?, - @SerializedName("thumbnail") @Expose val thumbnail:String?, - @SerializedName("gambar") @Expose val image:String?): Parcelable \ No newline at end of file + @PrimaryKey(autoGenerate = true) val id: Int, + @SerializedName("nama") @Expose val name: String?, + @SerializedName("lokasi") @Expose val location: String?, + @SerializedName("kategori") @Expose val category: String?, + @SerializedName("deskripsi") @Expose val description: String?, + @SerializedName("thumbnail") @Expose val thumbnail: String?, + @SerializedName("gambar") @Expose val image: String? +) : Parcelable \ No newline at end of file diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/viewmodels/FragmentListPlaceViewModel.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/viewmodels/FragmentListPlaceViewModel.kt index c40b8a0..414caae 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/viewmodels/FragmentListPlaceViewModel.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/viewmodels/FragmentListPlaceViewModel.kt @@ -14,7 +14,7 @@ class FragmentListPlaceViewModel(application: Application) : AndroidViewModel(ap var listPlace: MutableLiveData> = MutableLiveData() - fun getListPlace(placeLocation: PlaceLocation){ + fun getListPlace(placeLocation: PlaceLocation) { if (placeLocation == PlaceLocation.ALL) { dbPlaceRepository.places { listPlace.postValue(it) diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/viewmodels/ItemListPlaceViewModel.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/viewmodels/ItemListPlaceViewModel.kt index 42fe6d4..2153c4f 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/viewmodels/ItemListPlaceViewModel.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/viewmodels/ItemListPlaceViewModel.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel import androidx.databinding.ObservableField import com.yoesuv.infomadiun.menu.listplace.models.PlaceModel -class ItemListPlaceViewModel(placeModel: PlaceModel): ViewModel() { +class ItemListPlaceViewModel(placeModel: PlaceModel) : ViewModel() { var name: ObservableField = ObservableField(placeModel.name) var location: ObservableField = ObservableField(placeModel.location) diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/views/DetailListPlaceActivity.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/views/DetailListPlaceActivity.kt index fb97c69..602d6ed 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/views/DetailListPlaceActivity.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/listplace/views/DetailListPlaceActivity.kt @@ -11,7 +11,7 @@ import com.yoesuv.infomadiun.databinding.ActivityDetailListplaceBinding import com.yoesuv.infomadiun.menu.listplace.viewmodels.DetailListPlaceViewModel import com.yoesuv.infomadiun.utils.binding.ViewModelFactory -class DetailListPlaceActivity: AppCompatActivity() { +class DetailListPlaceActivity : AppCompatActivity() { private lateinit var binding: ActivityDetailListplaceBinding private val viewModel: DetailListPlaceViewModel by viewModels { ViewModelFactory(args.placeModel) } @@ -28,13 +28,13 @@ class DetailListPlaceActivity: AppCompatActivity() { } override fun onOptionsItemSelected(item: MenuItem): Boolean { - if (item.itemId==android.R.id.home) { + if (item.itemId == android.R.id.home) { onBackPressedDispatcher.onBackPressed() } return super.onOptionsItemSelected(item) } - private fun setupToolbar(){ + private fun setupToolbar() { setSupportActionBar(binding.toolbarDetailListPlace.toolbarInclude) supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setDisplayShowTitleEnabled(false) diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/maps/adapters/MyCustomInfoWindowAdapter.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/maps/adapters/MyCustomInfoWindowAdapter.kt index af8f137..556fa95 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/maps/adapters/MyCustomInfoWindowAdapter.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/maps/adapters/MyCustomInfoWindowAdapter.kt @@ -10,7 +10,7 @@ import com.yoesuv.infomadiun.R import com.yoesuv.infomadiun.databinding.CustomInfoWindowBinding import com.yoesuv.infomadiun.menu.maps.models.MarkerTag -class MyCustomInfoWindowAdapter(private val context: Context?): GoogleMap.InfoWindowAdapter { +class MyCustomInfoWindowAdapter(private val context: Context?) : GoogleMap.InfoWindowAdapter { private val binding = CustomInfoWindowBinding.inflate(LayoutInflater.from(context)) diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/maps/models/MarkerTag.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/maps/models/MarkerTag.kt index 1ddd095..42f126d 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/maps/models/MarkerTag.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/maps/models/MarkerTag.kt @@ -1,3 +1,3 @@ package com.yoesuv.infomadiun.menu.maps.models -class MarkerTag(val title:String, val type:Int, val latitude:Double?, val longitude:Double?) \ No newline at end of file +class MarkerTag(val title: String, val type: Int, val latitude: Double?, val longitude: Double?) \ No newline at end of file diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/maps/models/PinModel.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/maps/models/PinModel.kt index 082a7f6..00184d0 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/maps/models/PinModel.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/maps/models/PinModel.kt @@ -9,10 +9,10 @@ import com.google.gson.annotations.SerializedName @Keep @Entity(tableName = "pins") data class PinModel( - @PrimaryKey(autoGenerate = true) val id:Int?, - @SerializedName("name") @Expose val name:String?, - @SerializedName("lokasi") @Expose val location:Int?, - @SerializedName("latitude") val latitude:Double?, - @SerializedName("longitude") val longitude:Double?, - @SerializedName("image") @Expose val image:String? + @PrimaryKey(autoGenerate = true) val id: Int?, + @SerializedName("name") @Expose val name: String?, + @SerializedName("lokasi") @Expose val location: Int?, + @SerializedName("latitude") val latitude: Double?, + @SerializedName("longitude") val longitude: Double?, + @SerializedName("image") @Expose val image: String? ) \ No newline at end of file diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/maps/viewmodels/FragmentMapsViewModel.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/maps/viewmodels/FragmentMapsViewModel.kt index 9c44426..0f22467 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/maps/viewmodels/FragmentMapsViewModel.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/maps/viewmodels/FragmentMapsViewModel.kt @@ -13,7 +13,7 @@ class FragmentMapsViewModel(application: Application) : AndroidViewModel(applica var listPin: MutableLiveData> = MutableLiveData() - fun getListPin(){ + fun getListPin() { dbPin.pins { listPin.postValue(it) } diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/maps/views/MyLocationCallback.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/maps/views/MyLocationCallback.kt index de1959a..61e9424 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/maps/views/MyLocationCallback.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/maps/views/MyLocationCallback.kt @@ -11,14 +11,14 @@ import com.yoesuv.infomadiun.App import com.yoesuv.infomadiun.R import com.yoesuv.infomadiun.menu.maps.models.MarkerTag -class MyLocationCallback(private val googleMap: GoogleMap?) : LocationCallback(){ +class MyLocationCallback(private val googleMap: GoogleMap?) : LocationCallback() { private var markerUser: Marker? = null override fun onLocationResult(locationResult: LocationResult) { super.onLocationResult(locationResult) val listLocation = locationResult.locations - if (listLocation.isNotEmpty()){ + if (listLocation.isNotEmpty()) { val markerOpt = MarkerOptions() markerOpt.position(LatLng(listLocation[0].latitude, listLocation[0].longitude)) markerOpt.icon(BitmapDescriptorFactory.fromResource(R.drawable.ic_user_position)) diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/other/adapters/ChangeLogAdapter.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/other/adapters/ChangeLogAdapter.kt index eed6036..95ed7c7 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/other/adapters/ChangeLogAdapter.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/other/adapters/ChangeLogAdapter.kt @@ -6,8 +6,8 @@ import com.yoesuv.infomadiun.menu.other.adapters.viewholders.ChangeLogViewHolder import com.yoesuv.infomadiun.menu.other.models.ChangeLogModel import com.yoesuv.infomadiun.utils.AdapterCallback -class ChangeLogAdapter: ListAdapter - (AdapterCallback.diffChangeLogCallback){ +class ChangeLogAdapter : ListAdapter + (AdapterCallback.diffChangeLogCallback) { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ChangeLogViewHolder { return ChangeLogViewHolder.from(parent) diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/other/adapters/viewholders/ChangeLogViewHolder.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/other/adapters/viewholders/ChangeLogViewHolder.kt index 464eff7..b04d854 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/other/adapters/viewholders/ChangeLogViewHolder.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/other/adapters/viewholders/ChangeLogViewHolder.kt @@ -7,7 +7,7 @@ import com.yoesuv.infomadiun.databinding.ItemChangelogBinding import com.yoesuv.infomadiun.menu.other.models.ChangeLogModel import com.yoesuv.infomadiun.menu.other.viewmodels.ItemChangeLogViewModel -class ChangeLogViewHolder(val binding: ItemChangelogBinding): RecyclerView.ViewHolder(binding.root) { +class ChangeLogViewHolder(val binding: ItemChangelogBinding) : RecyclerView.ViewHolder(binding.root) { fun bind(changeLogModel: ChangeLogModel) { binding.itemChangelog = ItemChangeLogViewModel(changeLogModel) diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/other/adapters/viewholders/LicenseViewHolder.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/other/adapters/viewholders/LicenseViewHolder.kt index e935ae1..467aa6e 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/other/adapters/viewholders/LicenseViewHolder.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/other/adapters/viewholders/LicenseViewHolder.kt @@ -7,7 +7,7 @@ import com.yoesuv.infomadiun.databinding.ItemLibrariesBinding import com.yoesuv.infomadiun.menu.other.models.LicenseModel import com.yoesuv.infomadiun.menu.other.viewmodels.ItemLibrariesViewModel -class LicenseViewHolder(val binding: ItemLibrariesBinding): RecyclerView.ViewHolder(binding.root) { +class LicenseViewHolder(val binding: ItemLibrariesBinding) : RecyclerView.ViewHolder(binding.root) { fun bind(licenseModel: LicenseModel) { binding.itemLibraries = ItemLibrariesViewModel(licenseModel) diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/other/models/ChangeLogModel.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/other/models/ChangeLogModel.kt index ad70e8d..a127ccb 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/other/models/ChangeLogModel.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/other/models/ChangeLogModel.kt @@ -4,7 +4,7 @@ import com.google.errorprone.annotations.Keep @Keep data class ChangeLogModel( - val title: String?, - val description: String?, - val isLast: Boolean? + val title: String?, + val description: String?, + val isLast: Boolean? ) \ No newline at end of file diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/other/models/LicenseModel.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/other/models/LicenseModel.kt index 2f29d2e..c8baf9d 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/other/models/LicenseModel.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/other/models/LicenseModel.kt @@ -4,8 +4,8 @@ import com.google.errorprone.annotations.Keep @Keep data class LicenseModel( - val title: String?, - val url: String?, - val license: String?, - val isLast: Boolean? + val title: String?, + val url: String?, + val license: String?, + val isLast: Boolean? ) \ No newline at end of file diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/other/viewmodels/ChildFragmentChangelogViewModel.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/other/viewmodels/ChildFragmentChangelogViewModel.kt index c94518b..4f5df3b 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/other/viewmodels/ChildFragmentChangelogViewModel.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/other/viewmodels/ChildFragmentChangelogViewModel.kt @@ -6,12 +6,12 @@ import android.content.Context import com.yoesuv.infomadiun.R import com.yoesuv.infomadiun.menu.other.models.ChangeLogModel -class ChildFragmentChangelogViewModel: ViewModel() { +class ChildFragmentChangelogViewModel : ViewModel() { private var listChangelog: MutableList = mutableListOf() var listData: MutableLiveData> = MutableLiveData() - fun setupData(context: Context?){ + fun setupData(context: Context?) { listChangelog.clear() listChangelog.add(ChangeLogModel(context?.getString(R.string.ver_15), context?.getString(R.string.ver_15_info), false)) listChangelog.add(ChangeLogModel(context?.getString(R.string.ver_14), context?.getString(R.string.ver_14_info), false)) diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/other/viewmodels/ChildFragmentLibrariesViewModel.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/other/viewmodels/ChildFragmentLibrariesViewModel.kt index 60a884a..5780ab9 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/other/viewmodels/ChildFragmentLibrariesViewModel.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/other/viewmodels/ChildFragmentLibrariesViewModel.kt @@ -6,25 +6,50 @@ import android.content.Context import com.yoesuv.infomadiun.R import com.yoesuv.infomadiun.menu.other.models.LicenseModel -class ChildFragmentLibrariesViewModel: ViewModel() { +class ChildFragmentLibrariesViewModel : ViewModel() { private var listLibraries: MutableList = mutableListOf() var listData: MutableLiveData> = MutableLiveData() - fun setupData(context: Context?){ + fun setupData(context: Context?) { listLibraries.clear() - val icons8 = LicenseModel(context?.getString(R.string.icons8), context?.getString(R.string.icons8_url), context?.getString(R.string.icons8_license), false) - val retrofit = LicenseModel(context?.getString(R.string.retrofit), context?.getString(R.string.retrofit_url), context?.getString(R.string.retrofit_license), false) + val icons8 = + LicenseModel(context?.getString(R.string.icons8), context?.getString(R.string.icons8_url), context?.getString(R.string.icons8_license), false) + val retrofit = + LicenseModel(context?.getString(R.string.retrofit), context?.getString(R.string.retrofit_url), context?.getString(R.string.retrofit_license), false) val glide = LicenseModel(context?.getString(R.string.glide), context?.getString(R.string.glide_url), context?.getString(R.string.glide_license), false) - val photoView = LicenseModel(context?.getString(R.string.photoview), context?.getString(R.string.photoview_url), context?.getString(R.string.photoview_license), false) - val toasty = LicenseModel(context?.getString(R.string.toasty), context?.getString(R.string.toasty_url), context?.getString(R.string.toasty_license), true) - val googleDirection = LicenseModel(context?.getString(R.string.google_direction), context?.getString(R.string.google_direction_url), context?.getString(R.string.google_direction_license), false) - val sdp = LicenseModel(context?.getString(R.string.sdp_android), context?.getString(R.string.sdp_android_url), context?.getString(R.string.sdp_android_license), false) - val ssp = LicenseModel(context?.getString(R.string.ssp_android), context?.getString(R.string.ssp_android_url), context?.getString(R.string.sdp_android_license), false) - val okhttp = LicenseModel(context?.getString(R.string.okhttp), context?.getString(R.string.okhttp_url), context?.getString(R.string.okhttp_license), false) + val photoView = LicenseModel( + context?.getString(R.string.photoview), + context?.getString(R.string.photoview_url), + context?.getString(R.string.photoview_license), + false + ) + val toasty = + LicenseModel(context?.getString(R.string.toasty), context?.getString(R.string.toasty_url), context?.getString(R.string.toasty_license), true) + val googleDirection = LicenseModel( + context?.getString(R.string.google_direction), + context?.getString(R.string.google_direction_url), + context?.getString(R.string.google_direction_license), + false + ) + val sdp = LicenseModel( + context?.getString(R.string.sdp_android), + context?.getString(R.string.sdp_android_url), + context?.getString(R.string.sdp_android_license), + false + ) + val ssp = LicenseModel( + context?.getString(R.string.ssp_android), + context?.getString(R.string.ssp_android_url), + context?.getString(R.string.sdp_android_license), + false + ) + val okhttp = + LicenseModel(context?.getString(R.string.okhttp), context?.getString(R.string.okhttp_url), context?.getString(R.string.okhttp_license), false) val aosp = LicenseModel(context?.getString(R.string.aosp), context?.getString(R.string.aosp_url), context?.getString(R.string.aosp_license), false) val gson = LicenseModel(context?.getString(R.string.gson), context?.getString(R.string.gson_url), context?.getString(R.string.gson_license), false) - val dexcount = LicenseModel(context?.getString(R.string.dexcount), context?.getString(R.string.dexcount_url), context?.getString(R.string.dexcount_license), false) + val dexcount = + LicenseModel(context?.getString(R.string.dexcount), context?.getString(R.string.dexcount_url), context?.getString(R.string.dexcount_license), false) listLibraries.add(aosp) listLibraries.add(googleDirection) diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/other/viewmodels/ItemChangeLogViewModel.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/other/viewmodels/ItemChangeLogViewModel.kt index ad92296..1d69eef 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/other/viewmodels/ItemChangeLogViewModel.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/other/viewmodels/ItemChangeLogViewModel.kt @@ -5,7 +5,7 @@ import androidx.databinding.ObservableField import com.yoesuv.infomadiun.menu.other.models.ChangeLogModel import com.yoesuv.infomadiun.utils.AppHelper -class ItemChangeLogViewModel(changeLogModel: ChangeLogModel): ViewModel() { +class ItemChangeLogViewModel(changeLogModel: ChangeLogModel) : ViewModel() { var name: ObservableField = ObservableField(changeLogModel.title!!) var description: ObservableField = ObservableField(AppHelper.fromHtml(changeLogModel.description!!)) diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/other/viewmodels/ItemLibrariesViewModel.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/other/viewmodels/ItemLibrariesViewModel.kt index f051cb8..f23a912 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/other/viewmodels/ItemLibrariesViewModel.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/other/viewmodels/ItemLibrariesViewModel.kt @@ -5,7 +5,7 @@ import androidx.databinding.ObservableField import com.yoesuv.infomadiun.menu.other.models.LicenseModel import com.yoesuv.infomadiun.utils.AppHelper -class ItemLibrariesViewModel(licenseModel: LicenseModel): ViewModel() { +class ItemLibrariesViewModel(licenseModel: LicenseModel) : ViewModel() { var name: ObservableField = ObservableField(licenseModel.title!!) var url: ObservableField = ObservableField(licenseModel.url!!) diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/other/views/ChildFragmentChangelog.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/other/views/ChildFragmentChangelog.kt index cbfaf8b..79f3fc1 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/other/views/ChildFragmentChangelog.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/other/views/ChildFragmentChangelog.kt @@ -13,7 +13,7 @@ import com.yoesuv.infomadiun.databinding.ChildFragmentChangelogBinding import com.yoesuv.infomadiun.menu.other.adapters.ChangeLogAdapter import com.yoesuv.infomadiun.menu.other.viewmodels.ChildFragmentChangelogViewModel -class ChildFragmentChangelog: Fragment() { +class ChildFragmentChangelog : Fragment() { companion object { fun getInstance(): Fragment { @@ -39,7 +39,7 @@ class ChildFragmentChangelog: Fragment() { return binding.root } - private fun setupRecycler(){ + private fun setupRecycler() { binding.recyclerViewChangelog.layoutManager = LinearLayoutManager(context) adapter = ChangeLogAdapter() binding.recyclerViewChangelog.adapter = adapter diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/other/views/ChildFragmentInfo.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/other/views/ChildFragmentInfo.kt index 720f995..35387d6 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/other/views/ChildFragmentInfo.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/other/views/ChildFragmentInfo.kt @@ -12,7 +12,7 @@ import com.yoesuv.infomadiun.BuildConfig import com.yoesuv.infomadiun.R import com.yoesuv.infomadiun.databinding.ChildFragmentInfoBinding -class ChildFragmentInfo: Fragment() { +class ChildFragmentInfo : Fragment() { companion object { fun getInstance(): Fragment { diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/other/views/ChildFragmentLibraries.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/other/views/ChildFragmentLibraries.kt index 340a23c..c45fb63 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/other/views/ChildFragmentLibraries.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/other/views/ChildFragmentLibraries.kt @@ -12,7 +12,7 @@ import com.yoesuv.infomadiun.databinding.ChildFragmentLibrariesBinding import com.yoesuv.infomadiun.menu.other.adapters.LicenseAdapter import com.yoesuv.infomadiun.menu.other.viewmodels.ChildFragmentLibrariesViewModel -class ChildFragmentLibraries: Fragment() { +class ChildFragmentLibraries : Fragment() { companion object { fun getInstance(): Fragment { @@ -37,7 +37,7 @@ class ChildFragmentLibraries: Fragment() { return binding.root } - private fun setupRecycler(){ + private fun setupRecycler() { adapter = LicenseAdapter() binding.recyclerViewLicense.adapter = adapter } diff --git a/app/src/main/java/com/yoesuv/infomadiun/menu/other/views/ChildFragmentThanks.kt b/app/src/main/java/com/yoesuv/infomadiun/menu/other/views/ChildFragmentThanks.kt index ec2d86e..90074a9 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/menu/other/views/ChildFragmentThanks.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/menu/other/views/ChildFragmentThanks.kt @@ -10,7 +10,7 @@ import com.yoesuv.infomadiun.R import com.yoesuv.infomadiun.databinding.ChildFragmentThanksBinding import com.yoesuv.infomadiun.utils.AppHelper -class ChildFragmentThanks: Fragment(){ +class ChildFragmentThanks : Fragment() { companion object { fun getInstance(): Fragment { diff --git a/app/src/main/java/com/yoesuv/infomadiun/networks/ServiceFactory.kt b/app/src/main/java/com/yoesuv/infomadiun/networks/ServiceFactory.kt index b936937..7180f33 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/networks/ServiceFactory.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/networks/ServiceFactory.kt @@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit */ object ServiceFactory { - fun create(): RestApi{ + fun create(): RestApi { val logging = HttpLoggingInterceptor() if (BuildConfig.DEBUG) { @@ -32,10 +32,10 @@ object ServiceFactory { val client = clientBuilder.build() val retrofit = Retrofit.Builder() - .baseUrl(BASE_URL) - .addConverterFactory(GsonConverterFactory.create()) - .client(client) - .build() + .baseUrl(BASE_URL) + .addConverterFactory(GsonConverterFactory.create()) + .client(client) + .build() return retrofit.create(RestApi::class.java) } } \ No newline at end of file diff --git a/app/src/main/java/com/yoesuv/infomadiun/networks/db/AppDatabase.kt b/app/src/main/java/com/yoesuv/infomadiun/networks/db/AppDatabase.kt index b2cdb47..5fb10c6 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/networks/db/AppDatabase.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/networks/db/AppDatabase.kt @@ -13,7 +13,7 @@ import com.yoesuv.infomadiun.networks.db.dao.PinDaoAccess import com.yoesuv.infomadiun.networks.db.dao.PlaceDaoAccess @Database(entities = [PlaceModel::class, GalleryModel::class, PinModel::class], version = 1, exportSchema = false) -abstract class AppDatabase: RoomDatabase() { +abstract class AppDatabase : RoomDatabase() { abstract fun placeDaoAccess(): PlaceDaoAccess @@ -24,6 +24,7 @@ abstract class AppDatabase: RoomDatabase() { companion object { @Volatile private var instance: AppDatabase? = null + @Synchronized fun getInstance(context: Context): AppDatabase? { if (instance == null) { @@ -32,7 +33,7 @@ abstract class AppDatabase: RoomDatabase() { return instance } - private fun create(context: Context): AppDatabase{ + private fun create(context: Context): AppDatabase { return Room.databaseBuilder(context, AppDatabase::class.java, DB_NAME) .fallbackToDestructiveMigration() .build() diff --git a/app/src/main/java/com/yoesuv/infomadiun/networks/db/repositories/DbGalleryRepository.kt b/app/src/main/java/com/yoesuv/infomadiun/networks/db/repositories/DbGalleryRepository.kt index 5e407a8..6ba2c76 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/networks/db/repositories/DbGalleryRepository.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/networks/db/repositories/DbGalleryRepository.kt @@ -10,13 +10,13 @@ class DbGalleryRepository(context: Context, private val scope: CoroutineScope) { private val dbGallery = AppDatabase.getInstance(context)?.galleryDaoAccess() - fun galleries(galleries:(List?) -> Unit) { + fun galleries(galleries: (List?) -> Unit) { scope.launch { galleries(dbGallery?.galleries()) } } - suspend fun setupDataGalleries(galleries:(List?)) { + suspend fun setupDataGalleries(galleries: (List?)) { dbGallery?.deleteAllGallery() galleries?.forEach { galleryModel -> dbGallery?.insertGallery(galleryModel) diff --git a/app/src/main/java/com/yoesuv/infomadiun/networks/db/repositories/DbPinRepository.kt b/app/src/main/java/com/yoesuv/infomadiun/networks/db/repositories/DbPinRepository.kt index ec62c6a..1ee5b04 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/networks/db/repositories/DbPinRepository.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/networks/db/repositories/DbPinRepository.kt @@ -10,7 +10,7 @@ class DbPinRepository(context: Context, private val scope: CoroutineScope) { private val dbPin = AppDatabase.getInstance(context)?.pinDaoAccess() - fun pins(pins:(List?) -> Unit) { + fun pins(pins: (List?) -> Unit) { scope.launch { pins(dbPin?.pins()) } diff --git a/app/src/main/java/com/yoesuv/infomadiun/networks/db/repositories/DbPlaceRepository.kt b/app/src/main/java/com/yoesuv/infomadiun/networks/db/repositories/DbPlaceRepository.kt index 7488250..5638390 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/networks/db/repositories/DbPlaceRepository.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/networks/db/repositories/DbPlaceRepository.kt @@ -10,13 +10,13 @@ class DbPlaceRepository(context: Context, private val scope: CoroutineScope) { private val dbPlaces = AppDatabase.getInstance(context)?.placeDaoAccess() - fun places(places:(List?) -> Unit) { + fun places(places: (List?) -> Unit) { scope.launch { places(dbPlaces?.places()) } } - fun placesByLocation(location: String, places:(List?) -> Unit) { + fun placesByLocation(location: String, places: (List?) -> Unit) { scope.launch { places(dbPlaces?.placesByLocation(location)) } diff --git a/app/src/main/java/com/yoesuv/infomadiun/utils/AdapterCallback.kt b/app/src/main/java/com/yoesuv/infomadiun/utils/AdapterCallback.kt index 2dd5eb7..7633f9d 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/utils/AdapterCallback.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/utils/AdapterCallback.kt @@ -12,6 +12,7 @@ object AdapterCallback { override fun areItemsTheSame(oldItem: PlaceModel, newItem: PlaceModel): Boolean { return oldItem.name == newItem.name } + override fun areContentsTheSame(oldItem: PlaceModel, newItem: PlaceModel): Boolean { return oldItem == newItem } @@ -21,6 +22,7 @@ object AdapterCallback { override fun areItemsTheSame(oldItem: GalleryModel, newItem: GalleryModel): Boolean { return oldItem.caption == newItem.caption } + override fun areContentsTheSame(oldItem: GalleryModel, newItem: GalleryModel): Boolean { return oldItem == newItem } @@ -30,6 +32,7 @@ object AdapterCallback { override fun areItemsTheSame(oldItem: ChangeLogModel, newItem: ChangeLogModel): Boolean { return oldItem.title == newItem.title } + override fun areContentsTheSame(oldItem: ChangeLogModel, newItem: ChangeLogModel): Boolean { return oldItem == newItem } @@ -39,6 +42,7 @@ object AdapterCallback { override fun areItemsTheSame(oldItem: LicenseModel, newItem: LicenseModel): Boolean { return oldItem.title == newItem.title } + override fun areContentsTheSame(oldItem: LicenseModel, newItem: LicenseModel): Boolean { return oldItem == newItem } diff --git a/app/src/main/java/com/yoesuv/infomadiun/utils/binding/ViewModelFactory.kt b/app/src/main/java/com/yoesuv/infomadiun/utils/binding/ViewModelFactory.kt index 6d473ea..b977cbc 100644 --- a/app/src/main/java/com/yoesuv/infomadiun/utils/binding/ViewModelFactory.kt +++ b/app/src/main/java/com/yoesuv/infomadiun/utils/binding/ViewModelFactory.kt @@ -7,7 +7,7 @@ import com.yoesuv.infomadiun.menu.gallery.viewmodels.DetailGalleryViewModel import com.yoesuv.infomadiun.menu.listplace.models.PlaceModel import com.yoesuv.infomadiun.menu.listplace.viewmodels.DetailListPlaceViewModel -class ViewModelFactory(private val any: Any): ViewModelProvider.NewInstanceFactory() { +class ViewModelFactory(private val any: Any) : ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") override fun create(modelClass: Class): T {