Skip to content

Commit

Permalink
Gsoc 2023 migrating main activity to compose (#62)
Browse files Browse the repository at this point in the history
* Update for some issue In Deploy to Appetize

* removed Github Token from ci file

* Migrated fragment_invite_voters.xml to InviteVotersScreen.kt in compose

* Migrated fragment_voters.xml.xml to VotersListScreen.kt in compose

* Migrated fragment_finished_elections.xmle.xml.xml to ElectionsScreen.kt in compose

* Forgot Password Screen Migration to jetpack compose

* Migrated fragment_two_factor_auth.xml to TwoFactorAuthScreen.kt in compose

* Migrated fragment_login.xml to LoginScreen.kt Compose and Updated
facebook Sdk version to latest and added code changes according to new
methods in doc and updated gitlab-ci.yml for fbClientSecret

* Migrated fragment_home.xml to HomeScreen.kt in compose

* Migrated fragment_settings.xml to SettingScreen.kt in Compose

* Updated Main Activity parts to use Compose
  • Loading branch information
narendraanjana09 authored Sep 3, 2023
1 parent c58ad02 commit bd212f8
Show file tree
Hide file tree
Showing 46 changed files with 555 additions and 1,976 deletions.
14 changes: 13 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ dependencies {
testImplementation "junit:junit:$junitVersion"
androidTestImplementation "androidx.test:runner:$testRunnerVersion"
androidTestImplementation "androidx.test.espresso:espresso-core:$espressoCoreVersion"
// Lifecycle components
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleRuntime"
implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleExtensions"
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
Expand Down Expand Up @@ -199,6 +198,7 @@ dependencies {
androidTestImplementation composeBom
implementation 'androidx.compose.material3:material3'
implementation 'androidx.compose.material:material'
implementation 'androidx.compose.ui:ui-viewbinding'
implementation 'androidx.compose.ui:ui-tooling-preview'
debugImplementation 'androidx.compose.ui:ui-tooling'
androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
Expand All @@ -216,6 +216,12 @@ dependencies {
//extended Material Icons
implementation "androidx.compose.material:material-icons-extended:1.4.3"

//for live data to state
implementation("androidx.compose.runtime:runtime-livedata:$rootProject.composeLiveData")

//for language change
implementation "com.github.YarikSOffice:lingver:$rootProject.languageLibrary"

//date and time picker
implementation "com.maxkeppeler.sheets-compose-dialogs:core:$rootProject.date_time_picker"
implementation "com.maxkeppeler.sheets-compose-dialogs:calendar:$rootProject.date_time_picker"
Expand All @@ -226,4 +232,10 @@ dependencies {

//for language change
implementation "com.github.YarikSOffice:lingver:$rootProject.languageLibrary"

//navigation
implementation "androidx.navigation:navigation-compose:$rootProject.nav_version"

//Splash Screen
implementation "androidx.core:core-splashscreen:$rootProject.splash_screen"
}
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
android:resizeableActivity="true"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Agora"
android:theme="@style/Theme.App.Starting"
tools:targetApi="31"
>
<activity
Expand Down Expand Up @@ -46,7 +46,7 @@
<activity
android:name=".ui.activities.main.MainActivity"
android:configChanges="orientation|screenSize"
android:theme="@style/SplashTheme"
android:theme="@style/Theme.App.Starting"
android:windowSoftInputMode="adjustResize|stateHidden"
android:launchMode="singleTask"
android:exported="true">
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit bd212f8

Please sign in to comment.