Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
cf83e22
Setting up libraries gradle dependencies
dev-satyamthakur Jun 3, 2023
e8849ce
DashboardScreen WIP(1)
Jun 3, 2023
a797f6c
Dashboard Screen Finished
Jun 4, 2023
3484637
Merge pull request #1 from Devdroid-Android/development_dashboard
dev-satyamthakur Jun 5, 2023
c51a5a5
Updated the codebase to following linting rules - Setting up CI/CD
Jun 5, 2023
8601ac2
Fixed Linting
Jun 5, 2023
cd0715b
Modify workflow to use JDK 17
Jun 5, 2023
0a24f58
Merge pull request #4 from Devdroid-Android/development_dashboard
dev-satyamthakur Jun 5, 2023
ce0b606
Adding Model Classes for API responses
dev-satyamthakur Jun 5, 2023
7839aac
Fixing classes that did not end with a new line
dev-satyamthakur Jun 5, 2023
c20c7e7
Rebase into development branch (#5)
Jun 5, 2023
807bf9c
Dashboard Integration WIP(1)
Jun 5, 2023
c0ae033
Dashboard Integration WIP(2)
Jun 7, 2023
374bb49
Rebase into development branch (#5)
Jun 5, 2023
ed27b1b
Dashboard Integration WIP(1)
Jun 5, 2023
fd0f31e
Dashboard Integration WIP(2)
Jun 7, 2023
2733efa
Merge remote-tracking branch 'origin/development_dashboard' into deve…
DanilaSidukov Jun 8, 2023
4bc1460
complete layout for movie screen
DanilaSidukov Jun 8, 2023
720cf92
Dashboard Integration Temporary Finished (#6)
Jun 8, 2023
d1c10f3
Merge branch 'development' into development_movie
Jun 8, 2023
6c89ddd
try pass serializable data
DanilaSidukov Jun 14, 2023
c362587
try pass serializable data
DanilaSidukov Jun 16, 2023
d850dbe
pass movie item with parcelable
DanilaSidukov Jun 16, 2023
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
42 changes: 42 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: CI

on:
# Triggers the workflow on push and PR
push:
pull_request:

# Allows to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3

- name: set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '17'

- name: Make gradlew executable
run: chmod +x ./gradlew

- name: Ktlint Format
run: ./gradlew ktlintFormat

- name: ktLint Check
run: ./gradlew ktlintCheck

- name: Lint
run: ./gradlew lint

- name: Assembling
run: ./gradlew assembleDebug

- name: Unit testing
run: ./gradlew test
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
.gradle
/local.properties
/.idea/caches
/.idea/misc.xml
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
Expand Down
123 changes: 123 additions & 0 deletions .idea/codeStyles/Project.xml

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

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

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

17 changes: 17 additions & 0 deletions .idea/deploymentTargetDropDown.xml

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

1 change: 1 addition & 0 deletions .idea/gradle.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/kotlinc.xml

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

3 changes: 1 addition & 2 deletions .idea/misc.xml

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

71 changes: 67 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id "org.jlleitschuh.gradle.ktlint" version "11.3.1"
id 'kotlin-parcelize'
}

android {
namespace 'com.satyamthakur.silver'
compileSdk 33

Properties properties = new Properties()
if (project.rootProject.file("local.properties").exists()) {
properties.load(project.rootProject.file("local.properties").newDataInputStream())
}

defaultConfig {
applicationId "com.satyamthakur.silver"
minSdk 26
targetSdk 33
versionCode 1
versionName "1.0"

resValue "string", "api_key", properties.getProperty("api.key", "")
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
useSupportLibrary true
Expand All @@ -35,23 +43,29 @@ android {
}
buildFeatures {
compose true
buildConfig true
}
composeOptions {
kotlinCompilerExtensionVersion '1.3.2'
kotlinCompilerExtensionVersion '1.4.6'
}
packagingOptions {
resources {
excludes += '/META-INF/{AL2.0,LGPL2.1}'
}
}
testOptions {
unitTests {
includeAndroidResources true
}
}
}

dependencies {

implementation 'androidx.core:core-ktx:1.8.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
implementation 'androidx.activity:activity-compose:1.5.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'androidx.activity:activity-compose:1.7.2'
implementation platform('androidx.compose:compose-bom:2022.10.00')
implementation 'androidx.compose.ui:ui'
implementation 'androidx.compose.ui:ui-graphics'
Expand All @@ -64,4 +78,53 @@ dependencies {
androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
debugImplementation 'androidx.compose.ui:ui-tooling'
debugImplementation 'androidx.compose.ui:ui-test-manifest'

// Sys UI Controller - Navigation Animation
def accompanist_version = "0.31.2-alpha"
implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version"
implementation "com.google.accompanist:accompanist-navigation-animation:$accompanist_version"
implementation "com.google.accompanist:accompanist-flowlayout:$accompanist_version"

// Logging Interceptor
implementation "com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.6"

// Icons
implementation "androidx.compose.material:material-icons-extended"

// Koin
def koin_version = "3.4.1"
implementation "io.insert-koin:koin-android:$koin_version"
implementation "io.insert-koin:koin-androidx-compose:$koin_version"
testImplementation "io.insert-koin:koin-test:$koin_version"
testImplementation "io.insert-koin:koin-test-junit4:$koin_version"

// Retrofit
def retrofit_version = "2.9.0"
implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"

// ViewModel - Lifecycle
def lifecycle_version = "2.6.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"

// Coroutines
def coroutines_version = "1.7.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"


// Coil
implementation "io.coil-kt:coil-compose:2.4.0"

// Mockk
testImplementation "io.mockk:mockk:1.13.5"

// Robolectric
testImplementation "org.robolectric:robolectric:4.9"

// Timber
implementation 'com.jakewharton.timber:timber:5.0.1'
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package com.satyamthakur.silver

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.platform.app.InstrumentationRegistry
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.runner.RunWith

import org.junit.Assert.*

/**
* Instrumented test, which will execute on an Android device.
*
Expand All @@ -21,4 +19,4 @@ class ExampleInstrumentedTest {
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("com.satyamthakur.silver", appContext.packageName)
}
}
}
4 changes: 3 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET"/>

<application
android:name=".app.SilverApplication"
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
Expand All @@ -15,7 +18,6 @@
<activity
android:name=".MainActivity"
android:exported="true"
android:label="@string/app_name"
android:theme="@style/Theme.Silver">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
Loading