CringeStudios/Code-Guard
6
2
Fork 0
Code Issues 8 Pull Requests Packages Projects 1 Releases 1 Wiki Activity

Update dependencies, Remove menu_dynamic.xml

Browse Source
This commit is contained in:
MrLetsplay 2023-09-19 23:00:03 +02:00
parent 93ed718ca0
commit b82afe6277
Signed by: mr
SSH Key Fingerprint: SHA256:92jBH80vpXyaZHjaIl47pjRq+Yt7XGTArqQg1V7hSqg
3 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/build.gradle
View File

@ -5,12 +5,12 @@ plugins {
android {
namespace 'com.cringe_studios.cringe_authenticator'
compileSdk 33
compileSdk 34
defaultConfig {
applicationId "com.cringe_studios.cringe_authenticator"
minSdk 21
targetSdk 33
targetSdk 34
versionCode 1
versionName "1.0"
@ -59,20 +59,30 @@ protobuf {
}
dependencies {
constraints {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
}
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
}
}
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.9.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.lifecycle:lifecycle-livedata:2.4.1'
implementation 'androidx.lifecycle:lifecycle-viewmodel:2.4.1'
implementation 'androidx.navigation:navigation-fragment:2.5.3'
implementation 'androidx.navigation:navigation-ui:2.5.3'
implementation 'androidx.lifecycle:lifecycle-livedata:2.6.2'
implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.2'
implementation 'androidx.navigation:navigation-fragment:2.7.2'
implementation 'androidx.navigation:navigation-ui:2.7.2'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation "androidx.biometric:biometric:1.1.0"
implementation 'com.cringe_studios:CringeAuthenticatorLibrary:1.5'
implementation 'com.google.mlkit:barcode-scanning:17.1.0'
implementation 'com.google.mlkit:barcode-scanning:17.2.0'
implementation 'com.google.code.gson:gson:2.8.9'
implementation 'androidx.activity:activity:1.7.2'
def camerax_version = "1.2.3"
implementation "androidx.camera:camera-core:${camerax_version}"

3
app/src/main/java/com/cringe_studios/cringe_authenticator/MainActivity.java
View File

@ -202,9 +202,8 @@ public class MainActivity extends BaseActivity {
}
public void scanCodeFromImage() {
Object mediaType = ActivityResultContracts.PickVisualMedia.ImageOnly.INSTANCE; // Cursed, but needs to happen because otherwise Android Studio complains about type casting even though it works
pickQRCodeImage.launch(new PickVisualMediaRequest.Builder()
.setMediaType((ActivityResultContracts.PickVisualMedia.VisualMediaType) mediaType)
.setMediaType(ActivityResultContracts.PickVisualMedia.ImageOnly.INSTANCE)
.build());
}

17
app/src/main/res/menu/menu_dynamic.xml
View File

@ -1,17 +0,0 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context="com.cringe_studios.cringe_authenticator.MainActivity">
<item
android:id="@+id/action_code"
android:orderInCategory="100"
android:title="@string/add_code"
app:showAsAction="never"
android:onClick="addCode" />
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:title="@string/settings"
app:showAsAction="never"
android:onClick="openSettings" />
</menu>