Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Android CI/CD
on:
pull_request:
branches: [ master ]
push:

push:
branches: [ master ]

workflow_dispatch:

jobs:
Expand All @@ -23,7 +23,8 @@ jobs:
GOOGLE_SERVICE: ${{ secrets.GOOGLE_SERVICE }}
run: |
echo "$GOOGLE_SERVICE" >> app/google-services.json

echo "$GOOGLE_SERVICE" >> auth/google-services.json

- name: Set up JDK 11
uses: actions/setup-java@v3
with:
Expand All @@ -45,6 +46,6 @@ jobs:
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-.

- name: Build application
run: ./gradlew build --full-stacktrace
1 change: 1 addition & 0 deletions .github/workflows/emulator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
GOOGLE_SERVICE: ${{ secrets.GOOGLE_SERVICE }}
run: |
echo "$GOOGLE_SERVICE" >> app/google-services.json
echo "$GOOGLE_SERVICE" >> auth/google-services.json

- name: Set up JDK 11
uses: actions/setup-java@v3
Expand Down
8 changes: 1 addition & 7 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/deploymentTargetDropDown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 15 additions & 3 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

78 changes: 1 addition & 77 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
plugins {
id("com.android.application")
id("kotlin-android")
id("kotlin-kapt")
id("kotlin-parcelize")
id("androidx.navigation.safeargs.kotlin")
id("com.google.gms.google-services")
}

Expand All @@ -27,19 +24,6 @@ android {
"proguard-rules.pro"
)
}
getByName("debug") {
isTestCoverageEnabled = true
}
}

testOptions {
unitTests {
isIncludeAndroidResources = true
}
}

viewBinding {
android.buildFeatures.viewBinding = true
}

compileOptions {
Expand All @@ -60,65 +44,5 @@ dependencies {
implementation(project(":splashscreen"))
implementation(project(":main"))
implementation(project(":auth"))

implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.21")

/*Serialization*/
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")

/*Paging*/
implementation("androidx.paging:paging-runtime-ktx:3.1.1")

/*Dagger 2*/
val daggerVersion = "2.41"
implementation("com.google.dagger:dagger:$daggerVersion")
implementation("com.google.dagger:dagger-android:$daggerVersion")
implementation("com.google.dagger:dagger-android-support:$daggerVersion")
kapt("com.google.dagger:dagger-compiler:$daggerVersion")
kapt("com.google.dagger:dagger-android-processor:$daggerVersion")

/*Firebase*/
implementation(platform("com.google.firebase:firebase-bom:28.4.0"))
implementation("com.google.firebase:firebase-auth:21.0.3")
implementation("com.google.firebase:firebase-auth-ktx")
implementation("com.google.firebase:firebase-database:20.0.4")
implementation("com.google.android.gms:play-services-gcm:17.0.0")
kapt("com.google.firebase:firebase-auth:21.0.3")
implementation("com.google.firebase:firebase-storage:20.0.1")
implementation("com.firebaseui:firebase-ui-database:8.0.1")

/*Glide*/
val glideVersion = "4.12.0"
implementation("com.github.bumptech.glide:glide:$glideVersion")
annotationProcessor("com.github.bumptech.glide:compiler:$glideVersion")

/*Drawer Layout*/
implementation("androidx.drawerlayout:drawerlayout:1.1.1")

/*Navigation Component*/
val navVersion = "2.4.2"
implementation("androidx.navigation:navigation-fragment-ktx:$navVersion")
implementation("androidx.navigation:navigation-ui-ktx:$navVersion")
androidTestImplementation("androidx.navigation:navigation-testing:$navVersion")

/*Lifecycle components*/
val lifecycleVersion = "2.4.1"
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion")

/*Coroutines*/
val coroutinesVersion = "1.6.1-native-mt"
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
api("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")

//noinspection DifferentStdlibGradleVersion
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
implementation("androidx.core:core-ktx:1.7.0")
implementation("androidx.appcompat:appcompat:1.4.1")
implementation("com.google.android.material:material:1.7.0-alpha01")
implementation("androidx.constraintlayout:constraintlayout:2.1.3")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.3")
androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
implementation(project(":resources"))
}
2 changes: 1 addition & 1 deletion app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.kts.kts.
# proguardFiles setting in build.gradle.kts.kts.kts.kts.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,28 @@
<uses-permission android:name="android.permission.INTERNET" />

<application
android:name="st.slex.messenger.MessengerApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/ProjectTheme">
android:theme="@style/NewProjectTheme">
<activity
android:name="st.slex.messenger.splashscreen.SplashActivity"
android:exported="true"
android:theme="@style/SplashTheme">
android:theme="@style/NewSplashTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name="st.slex.messenger.main.ui.MainActivity"
android:exported="true" />
android:exported="false" />
<activity
android:name="st.slex.messenger.auth.ui.AuthActivity"
android:exported="false" />
android:exported="false"
android:windowSoftInputMode="stateAlwaysVisible" />

<service
android:name="st.slex.messenger.main.notification.PushService"
Expand Down
19 changes: 0 additions & 19 deletions app/src/main/java/st/slex/messenger/AppComponent.kt

This file was deleted.

6 changes: 0 additions & 6 deletions app/src/main/java/st/slex/messenger/AppModule.kt

This file was deleted.

20 changes: 0 additions & 20 deletions app/src/main/java/st/slex/messenger/MessengerApplication.kt

This file was deleted.

38 changes: 0 additions & 38 deletions app/src/main/res/values-night/themes.xml

This file was deleted.

Loading