0.1.0

.github/hooks/pre-commit

@@ -12,9 +12,7 @@ fi;
 echo "Running ktlint over these files:"
 echo "$CHANGED_FILES"
 
-./gradlew --quiet ktlintCheck -PinternalKtlintGitFilter="$CHANGED_FILES"
+./gradlew --quiet ktlintFormat -PinternalKtlintGitFilter="$CHANGED_FILES"
+git add $CHANGED_FILES
 
 echo "Completed ktlint run."
-
-echo "Completed ktlint hook."
-######## KTLINT-GRADLE HOOK END ########

.github/workflows/android.yml

@@ -1,10 +1,6 @@
 name: Android CI
 
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -18,4 +14,24 @@ jobs:
       with:
         java-version: 1.8
     - name: Build with Gradle
-      run: ./gradlew build
+      run: ./gradlew assembleDebug
+    - name: Upload APK
+      uses: actions/upload-artifact@v2
+      with:
+        name: app-debug.apk
+        path: app/build/outputs/apk/debug/app-debug.apk
+
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Run tests
+        run: ./gradlew -Pci --console=plain test
+      - name: Publish Test Report
+        uses: mikepenz/action-junit-report@v2
+        with:
+          report_paths: '**/build/test-results/test/TEST-*.xml'

CHANGELOG.md

@@ -1,4 +1,27 @@
 # Lemon changelog
 
-## Unversioned:
-- Put changes here;
+## Version history
+* [0.1.0](#010)
+* [0.0.4](#004)
+* [0.0.3](#003)
+* [0.0.2](#002)
+
+## 0.1.0
+- MVP release
+
+## 0.0.4
+- Feature: HomeScreen;
+- Feature: Cards;
+- Feature: Transactions;
+- Feature: Registration;
+
+## 0.0.3:
+- Feature: Profile;
+- User can change username, login or password;
+- Logout and autologin added.
+
+## 0.0.2:
+- Feature: Login;
+- User use cases;
+- basic DI;
+- basic app architecture.

README.md

@@ -1,5 +1,14 @@
-# lemon-android
+![build](https://github.com/AlmostGreatBand/lemon-android/actions/workflows/android.yml/badge.svg)
+# Lemon🍋 Android
 
-The actual code is on the `dev` branch, waiting for transaction-cache feature and will be merged here in the near future        
+Android client for Lemon App.
 
-android-client🍋
+| VERSIONS                        |
+| ------------------------------- |
+| __[Changelog](CHANGELOG.md)__   |
+| __[Release plan](RELEASES.md)__ | 
+
+# Team:
+- [Zhenya Zasko](https://github.com/NeProgramist)
+- [Oleh Kovalyshyn](https://github.com/ALEGATOR1209)
+- [Victoria Romanova](https://github.com/V1ckeyR)

RELEASES.md

@@ -2,7 +2,7 @@
 
 This document describes main features that must be implemented in each version
 
-Newest version: 0.0.0
+Newest version: 0.0.3
 
 ## 0.1.0
 

app/build.gradle

@@ -1,11 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-
-def getProp(name) {
-    return System.getenv(name) ?: rootProject.localprops[name] ?: project[name]
-}
 
 def genVersionCode() {
     return project.versionMajorApp * 100000 + project.versionMinorApp * 1000 + project.versionPatch.toInteger()
@@ -15,23 +9,24 @@ def genVersionName() {
     return "${project.versionMajorApp}.${project.versionMinorApp}.${project.versionPatch}"
 }
 
-
 android {
     compileSdkVersion 30
-    buildToolsVersion "30.0.2"
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.agb.lemon_android"
-        minSdkVersion 21
+        minSdkVersion 23
         targetSdkVersion 30
         versionCode genVersionCode()
         versionName genVersionName()
 
-        buildConfigField "String", "API_BASE_URL", '"' + getProp('API_BASE_URL') + '"'
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -49,47 +44,46 @@ android {
         into "../.git/hooks"
         fileMode 0777
     }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
 }
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    testImplementation 'junit:junit:4.12'
-
-    def preference_version = "1.1.1"
-    implementation "androidx.preference:preference-ktx:$preference_version"
-
-    def lifecycle_version = "2.2.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
-
-    def retrofit_version = "2.9.0"
-    implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
-    implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
-
-    def coroutines_adapter_version = "1.0.0"
-    implementation "com.jakewharton.retrofit:retrofit2-kotlin-coroutines-experimental-adapter:$coroutines_adapter_version"
-
-    def room_version = "2.2.5"
-    implementation "androidx.room:room-runtime:$room_version"
-    implementation "androidx.room:room-ktx:$room_version"
-    kapt "androidx.room:room-compiler:$room_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
 
-    def recycler_version = "1.1.0"
-    implementation "androidx.recyclerview:recyclerview:$recycler_version"
+    implementation "androidx.core:core-ktx:$androidx_core_version"
+    implementation "androidx.appcompat:appcompat:$androidx_app_compat_version"
+    implementation "androidx.constraintlayout:constraintlayout:$androidx_constraint_layout_version"
+    implementation "androidx.legacy:legacy-support-v4:$androidx_legacy_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$androidx_lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$androidx_lifecycle_version"
+    implementation "androidx.recyclerview:recyclerview:$androidx_recycler_version"
 
-    def material_version = "1.3.0-alpha03"
     implementation "com.google.android.material:material:$material_version"
 
-    def coroutines_version = "1.4.0-M1"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+    implementation "io.insert-koin:koin-core:$koin_version"
+    implementation "io.insert-koin:koin-android:$koin_version"
 
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    implementation project(path: ':data')
     implementation project(path: ':core')
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.8.0'
+    implementation project(path: ':core-ui')
+    implementation project(path: ':feature-login')
+    implementation project(path: ':feature-home')
+    implementation project(path: ':feature-profile')
+    implementation project(path: ':feature-registration')
+    implementation project(path: ':feature-cards')
+    implementation project(path: ':feature-transactions')
+
+    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.mockito:mockito-core:$mockito_version"
+    testImplementation "org.mockito:mockito-inline:$mockito_inline_version"
+    testImplementation "androidx.arch.core:core-testing:$androidx_arch_version"
+    androidTestImplementation "androidx.test.ext:junit:$androidx_junit_version"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$androidx_espresso_version"
 }

app/src/main/AndroidManifest.xml

@@ -2,19 +2,28 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.agb.lemon_android">
 
+    <uses-permission android:name="android.permission.INTERNET"/>
+
     <application
+        android:name=".di.App"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/LemonTheme"
+        android:allowBackup="false">
         <activity android:name=".ui.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <meta-data
+            android:name="preloaded_fonts"
+            android:resource="@array/preloaded_fonts" />
+
     </application>
 
 </manifest>

app/src/main/java/com/agb/lemon_android/di/App.kt

@@ -0,0 +1,37 @@
+package com.agb.lemon_android.di
+
+import android.app.Application
+import com.agb.data.di.dataModule
+import com.agb.feature_cards.di.cardsModule
+import com.agb.feature_home.di.homeModule
+import com.agb.feature_login.di.loginModule
+import com.agb.feature_profile.di.profileModule
+import com.agb.feature_registration.di.registrationModule
+import com.agb.feature_transactions.di.transactionsModule
+import org.koin.android.ext.koin.androidContext
+import org.koin.android.ext.koin.androidLogger
+import org.koin.core.context.startKoin
+import org.koin.core.logger.Level
+
+class App : Application() {
+    override fun onCreate() {
+        super.onCreate()
+
+        startKoin {
+            androidContext(applicationContext)
+            androidLogger(Level.DEBUG)
+
+            // app
+            modules(appModule)
+            modules(dataModule)
+
+            // features
+            modules(transactionsModule)
+            modules(cardsModule)
+            modules(loginModule)
+            modules(homeModule)
+            modules(profileModule)
+            modules(registrationModule)
+        }
+    }
+}

app/src/main/java/com/agb/lemon_android/di/AppModule.kt

@@ -0,0 +1,9 @@
+package com.agb.lemon_android.di
+
+import com.agb.lemon_android.ui.MainViewModel
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.dsl.module
+
+val appModule = module {
+    viewModel { MainViewModel(get()) }
+}