Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit 638b0887 authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Use some design from AndroidX preference

parent ecf17846

build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ buildscript { 
    ext.fragmentVersion = '1.2.5'

    ext.lifecycleVersion = '2.2.0'

    ext.navigationVersion = '2.3.0'

    ext.preferenceVersion = '1.1.1'

    ext.recyclerviewVersion = '1.1.0'



    ext.androidBuildGradleVersion = '3.6.3'

ui/build.gradle

+1 −4
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ dependencies { 
    implementation "androidx.appcompat:appcompat:$appcompatVersion"

    implementation "androidx.fragment:fragment:$fragmentVersion"

    implementation "androidx.recyclerview:recyclerview:$recyclerviewVersion"

    implementation "androidx.preference:preference:$preferenceVersion"



    // Kotlin coroutine for android

    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion"
@@ -58,10 +59,6 @@ dependencies { 
    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion"

    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutineVersion"



    // Activity result

    implementation "androidx.activity:activity:1.1.0"

    implementation "androidx.activity:activity-ktx:1.1.0"



    // Navigation

    implementation "androidx.navigation:navigation-fragment:$navigationVersion"

    implementation "androidx.navigation:navigation-ui:$navigationVersion"

ui/src/main/kotlin/org/microg/nlp/ui/BackendConfiguration.kt

+3 −3
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ import org.microg.nlp.api.Constants.ACTION_LOCATION_BACKEND 
import org.microg.nlp.api.GeocoderBackend

import org.microg.nlp.api.LocationBackend

import org.microg.nlp.client.UnifiedLocationClient

import org.microg.nlp.ui.viewmodel.BackendInfo

import org.microg.nlp.ui.viewmodel.BackendType

import org.microg.nlp.ui.model.BackendInfo

import org.microg.nlp.ui.model.BackendType

import java.security.MessageDigest

import java.security.NoSuchAlgorithmException

ui/src/main/kotlin/org/microg/nlp/ui/BackendDetailsFragment.kt

+6 −7
Original line number Diff line number Diff line
@@ -28,12 +28,12 @@ import androidx.lifecycle.lifecycleScope 
import kotlinx.coroutines.delay

import kotlinx.coroutines.launch

import org.microg.nlp.client.UnifiedLocationClient

import org.microg.nlp.ui.viewmodel.BackendType.GEOCODER

import org.microg.nlp.ui.viewmodel.BackendType.LOCATION

import org.microg.nlp.ui.model.BackendType.GEOCODER

import org.microg.nlp.ui.model.BackendType.LOCATION

import org.microg.nlp.ui.databinding.BackendDetailsBinding

import org.microg.nlp.ui.viewmodel.BackendDetailsCallback

import org.microg.nlp.ui.viewmodel.BackendInfo

import org.microg.nlp.ui.viewmodel.BackendType

import org.microg.nlp.ui.model.BackendDetailsCallback

import org.microg.nlp.ui.model.BackendInfo

import org.microg.nlp.ui.model.BackendType

import java.util.*



class BackendDetailsFragment : Fragment(R.layout.backend_details), BackendDetailsCallback {
@@ -83,7 +83,6 @@ class BackendDetailsFragment : Fragment(R.layout.backend_details), BackendDetail 


    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {

        binding = BackendDetailsBinding.inflate(inflater, container, false)

        binding.fragment = this

        binding.callbacks = this

        return binding.root

    }

ui/src/main/kotlin/org/microg/nlp/ui/BackendListFragment.kt

+3 −3
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ import org.microg.nlp.api.Constants.ACTION_LOCATION_BACKEND 
import org.microg.nlp.client.UnifiedLocationClient

import org.microg.nlp.ui.databinding.BackendListBinding

import org.microg.nlp.ui.databinding.BackendListEntryBinding

import org.microg.nlp.ui.viewmodel.BackendInfo

import org.microg.nlp.ui.viewmodel.BackendListEntryCallback

import org.microg.nlp.ui.viewmodel.BackendType

import org.microg.nlp.ui.model.BackendInfo

import org.microg.nlp.ui.model.BackendListEntryCallback

import org.microg.nlp.ui.model.BackendType



class BackendListFragment : Fragment(R.layout.backend_list), BackendListEntryCallback {

    val locationAdapter: BackendSettingsLineAdapter = BackendSettingsLineAdapter(this)