diff --git a/app/release/app-release.aab b/app/release/app-release.aab deleted file mode 100644 index b2a6836..0000000 Binary files a/app/release/app-release.aab and /dev/null differ diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm new file mode 100644 index 0000000..75b80c4 Binary files /dev/null and b/app/release/baselineProfiles/0/app-release.dm differ diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm new file mode 100644 index 0000000..935d7db Binary files /dev/null and b/app/release/baselineProfiles/1/app-release.dm differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 0000000..21bd5fb --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,37 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "ru.freedominc.wallenc", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "1.0", + "outputFile": "app-release.apk" + } + ], + "elementType": "File", + "baselineProfiles": [ + { + "minApi": 28, + "maxApi": 30, + "baselineProfiles": [ + "baselineProfiles/1/app-release.dm" + ] + }, + { + "minApi": 31, + "maxApi": 2147483647, + "baselineProfiles": [ + "baselineProfiles/0/app-release.dm" + ] + } + ], + "minSdkVersionForDexing": 24 +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b0e26b9..78008a3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,12 +8,13 @@ android:fullBackupContent="@xml/backup_rules" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" + android:name=".WallencApplication" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.Wallenc" tools:targetApi="31"> diff --git a/app/src/main/java/ru/freedominc/wallenc/ui/MainActivity.kt b/app/src/main/java/ru/freedominc/wallenc/MainActivity.kt similarity index 96% rename from app/src/main/java/ru/freedominc/wallenc/ui/MainActivity.kt rename to app/src/main/java/ru/freedominc/wallenc/MainActivity.kt index 79fe254..543711a 100644 --- a/app/src/main/java/ru/freedominc/wallenc/ui/MainActivity.kt +++ b/app/src/main/java/ru/freedominc/wallenc/MainActivity.kt @@ -1,4 +1,4 @@ -package ru.freedominc.wallenc.ui +package ru.freedominc.wallenc import android.os.Bundle import android.widget.Toast @@ -23,8 +23,10 @@ import com.yandex.authsdk.YandexAuthOptions import com.yandex.authsdk.YandexAuthResult import com.yandex.authsdk.YandexAuthSdk import com.yandex.authsdk.internal.strategy.LoginType +import dagger.hilt.android.AndroidEntryPoint import ru.freedominc.wallenc.ui.theme.WallencTheme +@AndroidEntryPoint class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -39,7 +41,6 @@ class MainActivity : ComponentActivity() { WallencTheme { Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding -> Greeting(modifier = Modifier.padding(innerPadding)) { - launcher.launch(loginOptions) } } diff --git a/app/src/main/java/ru/freedominc/wallenc/WallencApplication.kt b/app/src/main/java/ru/freedominc/wallenc/WallencApplication.kt new file mode 100644 index 0000000..dd914ae --- /dev/null +++ b/app/src/main/java/ru/freedominc/wallenc/WallencApplication.kt @@ -0,0 +1,9 @@ +package ru.freedominc.wallenc + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class WallencApplication : Application() { + +} \ No newline at end of file diff --git a/app/src/main/java/ru/freedominc/wallenc/ui/screens/main/MainScreen.kt b/app/src/main/java/ru/freedominc/wallenc/ui/screens/main/MainScreen.kt new file mode 100644 index 0000000..0c7617b --- /dev/null +++ b/app/src/main/java/ru/freedominc/wallenc/ui/screens/main/MainScreen.kt @@ -0,0 +1,8 @@ +package ru.freedominc.wallenc.ui.screens.main + +import androidx.compose.runtime.Composable + +@Composable +fun MainScreen(viewModel: MainViewModel) { + +} \ No newline at end of file diff --git a/app/src/main/java/ru/freedominc/wallenc/ui/screens/main/MainScreenState.kt b/app/src/main/java/ru/freedominc/wallenc/ui/screens/main/MainScreenState.kt new file mode 100644 index 0000000..cfacf11 --- /dev/null +++ b/app/src/main/java/ru/freedominc/wallenc/ui/screens/main/MainScreenState.kt @@ -0,0 +1,3 @@ +package ru.freedominc.wallenc.ui.screens.main + +data class MainScreenState(val value: Int) \ No newline at end of file diff --git a/app/src/main/java/ru/freedominc/wallenc/ui/screens/main/MainViewModel.kt b/app/src/main/java/ru/freedominc/wallenc/ui/screens/main/MainViewModel.kt new file mode 100644 index 0000000..1bce58d --- /dev/null +++ b/app/src/main/java/ru/freedominc/wallenc/ui/screens/main/MainViewModel.kt @@ -0,0 +1,9 @@ +package ru.freedominc.wallenc.ui.screens.main + +import androidx.lifecycle.ViewModel +import dagger.hilt.android.lifecycle.HiltViewModel + +@HiltViewModel +class MainViewModel : ViewModel() { + +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 20e2a01..132244e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,4 +20,4 @@ kotlin.code.style=official # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file +android.nonTransitiveRClass=true