brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate to non-transitive R

Browse Source
This commit is contained in:
Mygod
2021-11-05 22:18:43 -04:00
parent 4e639e5c17
commit cdfa662a1d
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gradle.properties
View File

@@ -13,6 +13,7 @@ android.databinding.incremental=true
android.enableJetifier=true android.enableJetifier=true
android.enableR8.fullMode=true android.enableR8.fullMode=true
android.enableResourceOptimizations=false android.enableResourceOptimizations=false
android.nonTransitiveRClass=true
android.useAndroidX=true android.useAndroidX=true
kapt.incremental.apt=true kapt.incremental.apt=true
org.gradle.jvmargs=-Xmx1536m org.gradle.jvmargs=-Xmx1536m

6
mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt
View File

@@ -40,13 +40,15 @@ class MainActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListen
binding.navigation.setOnItemSelectedListener(this) binding.navigation.setOnItemSelectedListener(this)
val badge = binding.navigation.getOrCreateBadge(R.id.navigation_clients).apply { val badge = binding.navigation.getOrCreateBadge(R.id.navigation_clients).apply {
backgroundColor = ContextCompat.getColor(this@MainActivity, R.color.colorSecondary) backgroundColor = ContextCompat.getColor(this@MainActivity, R.color.colorSecondary)
badgeTextColor = ContextCompat.getColor(this@MainActivity, R.color.primary_text_default_material_light) badgeTextColor = ContextCompat.getColor(this@MainActivity,
androidx.appcompat.R.color.primary_text_default_material_light)
} }
updateItem = binding.navigation.menu.findItem(R.id.navigation_update) updateItem = binding.navigation.menu.findItem(R.id.navigation_update)
updateItem.isCheckable = false updateItem.isCheckable = false
updateBadge = binding.navigation.getOrCreateBadge(R.id.navigation_update).apply { updateBadge = binding.navigation.getOrCreateBadge(R.id.navigation_update).apply {
backgroundColor = ContextCompat.getColor(this@MainActivity, R.color.colorSecondary) backgroundColor = ContextCompat.getColor(this@MainActivity, R.color.colorSecondary)
badgeTextColor = ContextCompat.getColor(this@MainActivity, R.color.primary_text_default_material_light) badgeTextColor = ContextCompat.getColor(this@MainActivity,
androidx.appcompat.R.color.primary_text_default_material_light)
} }
if (savedInstanceState == null) displayFragment(TetheringFragment()) if (savedInstanceState == null) displayFragment(TetheringFragment())
val model by viewModels<ClientViewModel>() val model by viewModels<ClientViewModel>()

2
mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt
View File

@@ -121,7 +121,7 @@ class SettingsPreferenceFragment : PreferenceFragmentCompat() {
.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
.putExtra(Intent.EXTRA_STREAM, .putExtra(Intent.EXTRA_STREAM,
FileProvider.getUriForFile(context, "be.mygod.vpnhotspot.log", logFile)), FileProvider.getUriForFile(context, "be.mygod.vpnhotspot.log", logFile)),
context.getString(R.string.abc_shareactionprovider_share_with))) context.getString(androidx.appcompat.R.string.abc_shareactionprovider_share_with)))
} }
true true
} }

9
mobile/src/main/java/be/mygod/vpnhotspot/widget/AlwaysAutoCompleteEditText.kt
View File

@@ -5,14 +5,15 @@ import android.graphics.Rect
import android.util.AttributeSet import android.util.AttributeSet
import android.view.View import android.view.View
import androidx.appcompat.widget.AppCompatAutoCompleteTextView import androidx.appcompat.widget.AppCompatAutoCompleteTextView
import be.mygod.vpnhotspot.R
/** /**
* Based on: https://gist.github.com/furycomptuers/4961368 * Based on: https://gist.github.com/furycomptuers/4961368
*/ */
class AlwaysAutoCompleteEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, class AlwaysAutoCompleteEditText @JvmOverloads constructor(
defStyleAttr: Int = R.attr.autoCompleteTextViewStyle) : context: Context,
AppCompatAutoCompleteTextView(context, attrs, defStyleAttr) { attrs: AttributeSet? = null,
defStyleAttr: Int = androidx.appcompat.R.attr.autoCompleteTextViewStyle,
) : AppCompatAutoCompleteTextView(context, attrs, defStyleAttr) {
override fun enoughToFilter() = true override fun enoughToFilter() = true
override fun onFocusChanged(focused: Boolean, direction: Int, previouslyFocusedRect: Rect?) { override fun onFocusChanged(focused: Boolean, direction: Int, previouslyFocusedRect: Rect?) {