Skip to content

Commit

Permalink
fix#1432 - Currency Code or Symbol Displayed
Browse files Browse the repository at this point in the history
  • Loading branch information
rutvik-panchal committed Nov 29, 2020
2 parents 8611532 + d9fd53c commit ca8f594
Show file tree
Hide file tree
Showing 621 changed files with 23,238 additions and 28,636 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/feature_branch_ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Workflow for feature branches

on:
push:
branches:
- '*'
- '!development'
- '!master'

jobs:
build:
name: Build APK
runs-on: ubuntu-latest
steps:
- name: Checking out repository
uses: actions/checkout@v2

# Set up JDK
- name: Set Up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8

# Install NDK
- name: Install NDK
run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;20.0.5594570" --sdk_root=${ANDROID_SDK_ROOT}

# Update Gradle Permission
- name: Change gradlew Permission
run: chmod +x gradlew

# Build App
- name: Build with Gradle
run: ./gradlew assemble
75 changes: 75 additions & 0 deletions .github/workflows/master_dev_ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: Workflow for master/development branches

on:
pull_request:
push:
branches:
- 'development'
- 'master'

jobs:
build:
name: Build APK
runs-on: ubuntu-latest
steps:
- name: Checking out repository
uses: actions/checkout@v2

# Set up JDK
- name: Set Up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8

# Install NDK
- name: Install NDK
run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;20.0.5594570" --sdk_root=${ANDROID_SDK_ROOT}

# Update Gradle Permission
- name: Change gradlew Permission
run: chmod +x gradlew

# Build App
- name: Build with Gradle
run: ./gradlew assemble

# Upload Built APK
- name: Upload Build Artifacts
uses: actions/upload-artifact@v2.2.0
with:
name: mifos-mobile
path: app/build/outputs/apk/debug/

lintCheck:
name: Static Analysis
runs-on: ubuntu-latest
steps:
- name: Checking out repository
uses: actions/checkout@v2

- name: Static Analysis
run: ./gradlew lint

- name: Upload Static Analysis Report For Mifos-Mobile Module
uses: actions/upload-artifact@v2.2.0
if: failure()
with:
name: Static Analysis Report
path: app/build/reports/

pmd:
name: PMD
runs-on: ubuntu-latest
steps:
- name: Checking out repository
uses: actions/checkout@v2

- name: PMD Check
run: ./gradlew pmd

- name: Upload PMD Report
uses: actions/upload-artifact@v2.2.0
if: failure()
with:
name: PMD Report
path: app/build/reports/
31 changes: 0 additions & 31 deletions .travis.yml

This file was deleted.

19 changes: 14 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

# Mifos-Mobile Android Application for MifosX

An Android Application built on top of the MifosX Self-Service platform for end-user customers to view/transact on the accounts and loans they hold. Data visible to customers will be a sub-set of what staff can see. This is a native Android Application written in Java with POJO classes in Kotlin.
An Android Application built on top of the MifosX Self-Service platform for end-user customers to view/transact on the accounts and loans they hold. Data visible to customers will be a sub-set of what staff can see. This is a native Android Application written in Kotlin.

### Status

[![Join the chat at https://gitter.im/openMF/self-service-app](https://badges.gitter.im/openMF/self-service-app.svg)](https://gitter.im/openMF/self-service-app?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Build Status](https://travis-ci.org/openMF/mifos-mobile.svg?branch=development)](https://travis-ci.org/openMF/mifos-mobile)

| Master | Development | Chat |
|------------|-----------------|-----------------|
| ![Mifos-Mobile CI[Master/Dev]](https://github.com/openMF/mifos-mobile/workflows/Mifos-Mobile%20CI%5BMaster/Dev%5D/badge.svg?branch=master) | ![Mifos-Mobile CI[Master/Dev]](https://github.com/openMF/mifos-mobile/workflows/Mifos-Mobile%20CI%5BMaster/Dev%5D/badge.svg?branch=development) |[![Join the chat at https://gitter.im/openMF/self-service-app](https://badges.gitter.im/openMF/self-service-app.svg)](https://gitter.im/openMF/self-service-app?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)|

## Screenshots

Expand All @@ -29,7 +29,7 @@ We have the following branches :
* **development**
All the contributions should be pushed to this branch. If you're making a contribution,
you are supposed to make a pull request to _development_.
Please make sure it passes a build check on Travis.
Please make sure it passes a build check on Github Workflows CI.

It is advisable to clone only the development branch using the following command:

Expand All @@ -42,6 +42,12 @@ We have the following branches :
* **master**
The master branch contains all the stable and bug-free working code. The development branch once complete will be merged with this branch.

To get the latest apk of master/development branch from Github Artifacts, follow these steps:
1. Go to to the [Actions](https://github.com/openMF/mifos-mobile/actions) tab of this repository.
2. Select the latest workflow for master/development branch.
3. Click on hyperlink 'mifos-mobile' in Artifacts section.
4. Extract the downloaded file and get the apk.

## Development Setup

Before you begin, you should have already downloaded the Android Studio SDK and set it up correctly. You can find a guide on how to do this here: [Setting up Android Studio](http://developer.android.com/sdk/installing/index.html?pkg=studio).
Expand All @@ -68,3 +74,6 @@ View the [wiki](https://github.com/openMF/self-service-app/wiki) to see pages th

See the [requirements](https://github.com/openMF/self-service-app/wiki/Design-&-Requirements) for an initial design mockup and documentation on the Fineract API.

## Note

The UI design is currently being revamped. New design can be found [here](https://docs.google.com/presentation/d/1yFR19vGlKW-amxzGms8TgPzd1jWkrALPFcaC85EyYpw/edit#slide=id.g6c6ccd991d_0_42)
19 changes: 12 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ apply plugin: 'io.fabric'
apply plugin: 'com.google.gms.oss.licenses.plugin'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'

apply from: '../config/quality/quality.gradle'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
ndkVersion rootProject.ext.ndkVersion

defaultConfig {
applicationId "org.mifos.mobile"
Expand Down Expand Up @@ -76,7 +78,7 @@ dependencies {
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0'
annotationProcessor "com.github.Raizlabs.DBFlow:dbflow-processor:$rootProject.dbflowVersion"
kapt "com.github.Raizlabs.DBFlow:dbflow-processor:$rootProject.dbflowVersion"
implementation "com.github.Raizlabs.DBFlow:dbflow-core:$rootProject.dbflowVersion"
implementation "com.github.Raizlabs.DBFlow:dbflow:$rootProject.dbflowVersion"

Expand All @@ -95,7 +97,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"

//Square dependencies
implementation('com.squareup.retrofit2:retrofit:$rootProject.retrofitVersion') {
implementation("com.squareup.retrofit2:retrofit:$rootProject.retrofitVersion") {
// exclude Retrofit’s OkHttp peer-dependency module and define your own module import
exclude module: 'okhttp'
}
Expand All @@ -109,17 +111,20 @@ dependencies {
implementation "io.reactivex.rxjava2:rxjava:$rootProject.rxjavaVersion"

//Dagger dependencies
annotationProcessor "com.google.dagger:dagger-compiler:$rootProject.daggerVersion"
kapt "com.google.dagger:dagger-compiler:$rootProject.daggerVersion"
implementation "com.google.dagger:dagger:$rootProject.daggerVersion"
compileOnly 'javax.annotation:jsr250-api:1.0' //Required by Dagger2

//Butter Knife
implementation "com.jakewharton:butterknife:$rootProject.butterKnifeVersion"
annotationProcessor "com.jakewharton:butterknife-compiler:$rootProject.butterKnifeVersion"
implementation "com.jakewharton:butterknife:$butterKnifeVersion"
kapt "com.jakewharton:butterknife-compiler:$butterKnifeVersion"
implementation('com.crashlytics.sdk.android:crashlytics:2.6.7@aar') {
transitive = true
}

//Annotation library
implementation "androidx.annotation:annotation:$rootProject.annotationLibraryVersion"

//qr code
implementation "com.google.zxing:core:$rootProject.zxingcoreVersion"
implementation "me.dm7.barcodescanner:zxing:$rootProject.zxingbarcodescannerVersion"
Expand All @@ -132,7 +137,7 @@ dependencies {

//multidex
implementation "androidx.multidex:multidex:$rootProject.multiDexVersion"

//TableView
implementation "com.evrencoskun.library:tableview:$rootProject.tableViewVersion"

Expand All @@ -155,4 +160,4 @@ dependencies {
androidTestImplementation "androidx.test:runner:$rootProject.runnerVersion"
androidTestImplementation "androidx.test:rules:$rootProject.rulesVersion"
}
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.gms.google-services'
25 changes: 0 additions & 25 deletions app/src/androidTest/java/org/mifos/mobile/ApplicationTest.java

This file was deleted.

21 changes: 21 additions & 0 deletions app/src/androidTest/java/org/mifos/mobile/ApplicationTest.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package org.mifos.mobile

import androidx.test.InstrumentationRegistry
import androidx.test.runner.AndroidJUnit4

import org.junit.Assert
import org.junit.Test
import org.junit.runner.RunWith

/**
* [Testing Fundamentals](http://d.android.com/tools/testing/testing_android.html)
*/
@RunWith(AndroidJUnit4::class)
class ApplicationTest {
@Test
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getTargetContext()
Assert.assertEquals("org.mifos.mobile", appContext.packageName)
}
}
78 changes: 0 additions & 78 deletions app/src/commonTest/java/org/mifos/mobile/FakeJsonName.java

This file was deleted.

Loading

0 comments on commit ca8f594

Please sign in to comment.