Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
dac1469
onCheckChangedListener added in searchFragment
Dec 4, 2020
36206de
Paginated the report result in ReportDetailFragment
danishjamal104 Dec 27, 2020
4277de9
Date formatted in readable format in client charges list item
danishjamal104 Dec 31, 2020
3bf46e7
Snackbar added to Search Fragment
NikunjGarg2000 Jan 30, 2021
86fc8ce
UI redesign of client identifier list item
danishjamal104 Dec 19, 2020
e573700
Merge pull request #1650 from danishjamal104/fix-1647
iamsh4shank Jun 23, 2021
bcfdc5a
ui changes in client_details fragment.
danishjamal104 Nov 19, 2020
71d3d41
Merge pull request #1563 from danishjamal104/ui-improvements-client-info
iamsh4shank Jun 23, 2021
c8e47da
layout enhancements in item_individiual_collection_sheet.xml
danishjamal104 Dec 22, 2020
2f2e67d
Toast corrected when no internet connectivity in SavingAccountsSummary
danishjamal104 Dec 3, 2020
fc20da0
infinite refresh issue resolved
danishjamal104 Nov 21, 2020
627a787
Merge pull request #1670 from danishjamal104/fix-1654
iamsh4shank Jul 8, 2021
596c3db
interactive clear button
iamsh4shank Jan 8, 2020
9b3a536
Merge pull request #1253 from iamsh4shank/patch7
iamsh4shank Jul 8, 2021
ff2d5ab
Up button in Survey question page
iamsh4shank Jan 11, 2020
16d904f
Merge pull request #1262 from iamsh4shank/patch9
iamsh4shank Jul 8, 2021
7b7ff77
Merge pull request #1741 from NikunjGarg2000/Fix#1740
iamsh4shank Jul 12, 2021
4f0d755
Feat: Bottom navigation and fab implementation
iamsh4shank Jun 19, 2020
1b7a0ae
Merge pull request #1521 from iamsh4shank/bottomNav
iamsh4shank Jul 12, 2021
f0ee19a
Merge pull request #1598 from danishjamal104/fix-1596
iamsh4shank Jul 12, 2021
6725c93
UI enhancement in CenterDetailsFragment
danishjamal104 Dec 6, 2020
4ff2b55
Intro added in SearchFragment
danishjamal104 Dec 11, 2020
33d5bc3
Transaction details layout added
danishjamal104 Dec 30, 2020
98b57b4
replaced static declaration of text to tools namespace
danishjamal104 Nov 25, 2020
6b050c9
visibility of info text fixed in individual collection sheet
danishjamal104 Dec 21, 2020
1a4c0ec
Merge pull request #1575 from danishjamal104/fix-1573
iamsh4shank Jul 13, 2021
ab6f0d2
Merge pull request #1616 from danishjamal104/fix-1614
iamsh4shank Jul 13, 2021
ddc1c52
Merge pull request #1603 from danishjamal104/fix-1601
iamsh4shank Jul 13, 2021
8971459
Merge pull request #1695 from danishjamal104/fix-1690
iamsh4shank Jul 13, 2021
61beb2b
Merge pull request #1697 from danishjamal104/fix-1696
iamsh4shank Jul 16, 2021
e4d6fcc
Merge pull request #1655 from danishjamal104/fix-1653
iamsh4shank Jul 16, 2021
121c9e9
Merge pull request #1592 from danishjamal104/fix-1590
iamsh4shank Jul 16, 2021
3b47647
InstanceURl edit prefrence added in settings
danishjamal104 Dec 9, 2020
dc987f2
Merge pull request #1569 from danishjamal104/fix-issue-1568
iamsh4shank Jul 17, 2021
e482957
Auto search added when user add filter in searchFragment
danishjamal104 Dec 3, 2020
7c527c2
Merge pull request #1589 from danishjamal104/fix-1588
iamsh4shank Jul 18, 2021
cf87b92
Merge pull request #1686 from danishjamal104/fix-1682
iamsh4shank Jul 19, 2021
465ff19
Merge pull request #1612 from danishjamal104/fix-1610
iamsh4shank Jul 20, 2021
315450f
search functionality added in individual collection sheet
danishjamal104 Dec 25, 2020
69c62a0
Language setting change fixed
danishjamal104 Jul 20, 2021
ebf60ff
Merge pull request #1820 from danishjamal104/lang-setting-fix
iamsh4shank Jul 20, 2021
14d4345
Merge pull request #1677 from danishjamal104/fix-1671
iamsh4shank Jul 20, 2021
929e1cb
Language setting fixed, code reformatted and optimised
danishjamal104 Jul 20, 2021
6c15132
Merge pull request #1821 from danishjamal104/lang-setting-fix
iamsh4shank Jul 22, 2021
90a9c6b
Fix: cache for GitHub Actions
Grandolf49 Jul 23, 2021
7b2c65e
Merge pull request #1822 from Grandolf49/gh-actions-fix
Grandolf49 Jul 23, 2021
05ea814
Merge branch 'master' of https://github.com/openMF/android-client int…
Grandolf49 Jul 23, 2021
9bf0068
Merge pull request #1823 from openMF/release-1.1
Grandolf49 Jul 27, 2021
dddfe26
Fix: distinct jobs for gradle tasks
Grandolf49 Jul 27, 2021
169fa69
Merge pull request #1824 from Grandolf49/gh-fix
Grandolf49 Jul 27, 2021
dcd653b
Datatable and Savings sdk migration
danishjamal104 Mar 19, 2022
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
144 changes: 122 additions & 22 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,126 @@
name: Android Build
on: [push, pull_request]
name: Android Client CI
on:
push:
pull_request:
branches:
- master

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

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

# Build with Gradle
- name: Build with Gradle
run: chmod +x gradlew && ./gradlew build check

# Upload Build Artifact
- name: Upload Build Artifacts
uses: actions/upload-artifact@v2.2.0
with:
# Artifact name
name: apk-debug
# File path describing what artifact to upload
path: app/build/outputs/apk/debug/app-debug.apk
- uses: actions/checkout@v2

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

# Build with Gradle
- name: Build with Gradle
run: chmod +x gradlew && ./gradlew assembleDebug

# Upload APK
- name: Upload APK
uses: actions/upload-artifact@v2.2.0
with:
# Artifact name
name: android-client-app
# File path describing what artifact to upload
path: mifosng-android/build/outputs/apk/debug/mifosng-android-debug.apk

test:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

# Test with Gradle
- name: Test App
run: ./gradlew test

# Upload test reports
- name: Upload Test Reports
uses: actions/upload-artifact@v2.2.0
with:
# Artifact name
name: test-reports
# File path describing what artifact to upload
path: mifosng-android/build/reports/tests/**

lintCheck:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

# Perform Lint Check
- name: Lint Check
run: ./gradlew lint

# Upload reports
- name: Upload Lint Reports
uses: actions/upload-artifact@v2.2.0
with:
# Artifact name
name: lint-reports
# File path describing what artifact to upload
path: mifosng-android/build/reports/lint-results**

pmd:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

# Perform PMD Check
- name: PMD Check
run: ./gradlew pmd

# Upload reports
- name: Upload PMD Reports
uses: actions/upload-artifact@v2.2.0
with:
# Artifact name
name: pmd-reports
# File path describing what artifact to upload
path: mifosng-android/build/reports/pmd/**

checkstyle:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

# Perform Checkstyle Check
- name: Checkstyle
run: ./gradlew checkstyle

# Upload reports
- name: Upload Checkstyle Reports
uses: actions/upload-artifact@v2.2.0
with:
# Artifact name
name: checkstyle-reports
# File path describing what artifact to upload
path: mifosng-android/build/reports/checkstyle/**

findbugs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

# Find bugs Check
- name: Findbugs
run: ./gradlew findbugs

# Upload reports
- name: Upload Checkstyle Reports
uses: actions/upload-artifact@v2.2.0
with:
# Artifact name
name: findbugs-reports
# File path describing what artifact to upload
path: mifosng-android/build/reports/findbugs/**
13 changes: 8 additions & 5 deletions mifosng-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ buildscript {
google()
mavenCentral()
maven { url 'https://maven.fabric.io/public' }
maven { url "https://jitpack.io" }
jcenter()
}
dependencies {
Expand Down Expand Up @@ -105,7 +106,6 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguardTest-rules.pro'
}

}
lintOptions {
abortOnError false
Expand All @@ -114,7 +114,6 @@ android {
disable 'OutdatedLibrary'
}


// Exclude duplicated Hamcrest LICENSE.txt from being packaged into the apk.
// This is a workaround for https://code.google.com/p/android/issues/detail?id=65445.
// The Hamcrest is used in tests.
Expand All @@ -135,7 +134,6 @@ android {

task buildAndEMailAPK(type: Exec, description: 'Builds and Generates a Signed APK and emails it') {


}

tasks.withType(JavaCompile) {
Expand Down Expand Up @@ -179,6 +177,11 @@ dependencies {
implementation "com.google.maps.android:android-maps-utils:$rootProject.mapUtilsServices"
implementation 'androidx.test.espresso:espresso-idling-resource:3.1.0'

//Bottom navigation
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.navigation:navigation-fragment:2.2.2'
implementation 'androidx.navigation:navigation-ui:2.2.2'

//Dagger dependencies
annotationProcessor "com.google.dagger:dagger-compiler:$rootProject.daggerVersion"
implementation "com.google.dagger:dagger:$rootProject.daggerVersion"
Expand Down Expand Up @@ -217,6 +220,8 @@ dependencies {
implementation 'com.facebook.stetho:stetho:1.3.1'
implementation 'com.facebook.stetho:stetho-okhttp3:1.3.1'

implementation 'com.github.deano2390:MaterialShowcaseView:1.3.4'


implementation "com.joanzapata.iconify:android-iconify-material:2.1.1" // (v2.0.0)
implementation('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
Expand All @@ -225,7 +230,6 @@ dependencies {
implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
implementation 'com.github.bumptech.glide:glide:3.7.0'


//mifos passcode
implementation "com.mifos.mobile:mifos-passcode:$mifosPasscodeVersion"

Expand Down Expand Up @@ -257,7 +261,6 @@ dependencies {
//preferences
implementation "androidx.preference:preference:$preference"
}

/*
All direct/transitive dependencies shared between your test and production APKs need to be
excluded from the test APK! This is necessary because both APKs will contain the same classes. Not
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

import com.mifos.mifosxdroid.R;
import com.mifos.mifosxdroid.online.ClientActivity;
import com.mifos.mifosxdroid.online.savingaccountsummary.SavingsAccountSummaryFragment;
import com.mifos.mifosxdroid.online.documentlist.DocumentListFragment;
import com.mifos.objects.accounts.savings.DepositType;
import com.mifos.utils.Constants;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import android.test.suitebuilder.annotation.MediumTest;

import com.mifos.mifosxdroid.R;
import com.mifos.mifosxdroid.online.SurveyQuestionActivity;

import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.action.ViewActions.click;
Expand Down
33 changes: 25 additions & 8 deletions mifosng-android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,26 @@
android:name=".login.LoginActivity"
android:label="@string/mifos_account"
android:screenOrientation="portrait" />
<activity
android:name=".HomeActivity"
android:label="home_activity"
android:windowSoftInputMode="adjustPan"
android:screenOrientation="portrait" />
<activity
android:name=".online.DashboardActivity"
android:label="@string/dashboard"
android:screenOrientation="portrait" />

<activity
android:name=".online.SurveyQuestionActivity"
android:label="Survey"
android:screenOrientation="portrait" />
android:parentActivityName="com.mifos.mifosxdroid.online.ClientActivity"
android:screenOrientation="portrait">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.mifos.mifosxdroid.online.ClientActivity"/>
</activity>

<activity
android:name=".online.GroupsActivity"
android:configChanges="orientation|screenSize"
Expand All @@ -66,27 +78,27 @@
android:name=".online.CentersActivity"
android:label="@string/title_activity_centers"
android:screenOrientation="portrait"
android:parentActivityName=".online.DashboardActivity">
android:parentActivityName=".HomeActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".online.DashboardActivity" />
android:value=".HomeActivity" />
</activity>
<activity
android:name=".online.GenerateCollectionSheetActivity"
android:configChanges="orientation|screenSize"
android:label="@string/title_activity_generate_collection_sheet"
android:parentActivityName=".online.DashboardActivity">
android:parentActivityName=".HomeActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".online.DashboardActivity" />
android:value=".HomeActivity" />
</activity>
<activity
android:name=".online.RunReportsActivity"
android:label="@string/run_report"
android:parentActivityName=".online.DashboardActivity">
android:parentActivityName=".HomeActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".online.DashboardActivity" />
android:value=".HomeActivity" />
</activity>
<activity
android:name=".ClientListActivity"
Expand Down Expand Up @@ -129,7 +141,12 @@
<activity
android:name=".SettingsActivity"
android:label="@string/settings"
android:screenOrientation="portrait" />
android:screenOrientation="portrait"
android:parentActivityName=".HomeActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".HomeActivity" />
</activity>
<activity
android:name=".offline.syncsavingsaccounttransaction.SyncSavingsAccountTransactionActivity"
android:label="@string/sync_savingsaccounttransactions"
Expand Down
Loading