Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
4844041
Conversion: Create new Client
iamsh4shank Aug 11, 2020
bfff0dd
Conversion: Centers related fragments and activities
iamsh4shank Aug 19, 2020
39e79f1
Converison: Savings Account related fragments
iamsh4shank Aug 20, 2020
95a5187
Conversion: Loan Accounts related fragments
iamsh4shank Aug 21, 2020
2126ff0
Conversion: Client Signature, datatable, document, and Notes
iamsh4shank Aug 23, 2020
d42ca5d
Conversion: Collection sheet and new individual collection sheet
iamsh4shank Aug 24, 2020
15b5922
Conversion: Client related fragment
iamsh4shank Aug 29, 2020
55e6c1d
Merge pull request #1533 from robustTechie/kot1
Grandolf49 Feb 13, 2021
14bba8e
Conversion: Groups related fragments
iamsh4shank Aug 12, 2020
8b95ff2
Merge pull request #1535 from robustTechie/groupConversion
Grandolf49 Feb 13, 2021
870402b
Conversion:Survey related fragments and activities
iamsh4shank Aug 19, 2020
bd73cc9
Merge pull request #1539 from robustTechie/surveyConversion
Grandolf49 Feb 14, 2021
5376800
Fix: Resolved merge conflict
Grandolf49 Feb 15, 2021
55b5518
Merge branch 'robustTechie-centerConversion' into kotlin-conversion
Grandolf49 Feb 15, 2021
6cad38e
Merge pull request #1542 from robustTechie/savingConversion
Grandolf49 Feb 15, 2021
58aa1c1
Merge pull request #1543 from robustTechie/loanConverison
Grandolf49 Feb 15, 2021
3dade74
Merge pull request #1544 from robustTechie/docConversion
Grandolf49 Feb 15, 2021
366b759
Merge pull request #1545 from robustTechie/sheetConversion
Grandolf49 Feb 15, 2021
5ec9b57
Merge pull request #1550 from robustTechie/clientCOnversion
Grandolf49 Feb 15, 2021
7aa6225
minor issue fix
iamsh4shank Feb 15, 2021
1d163a7
Merge pull request #1777 from robustTechie/kotlin-conversion
Grandolf49 Feb 17, 2021
fff3063
Merge branch 'master' of https://github.com/openMF/android-client int…
Grandolf49 Feb 19, 2021
0d0ad2b
minor bug fixed
iamsh4shank Feb 20, 2021
89195c1
Merge pull request #1782 from robustTechie/kotlin-conversion
iamsh4shank Feb 20, 2021
ccd6e3e
Lint bug fixed
iamsh4shank Feb 20, 2021
ac11e37
Merge branch 'kotlin-conversion' into kotlin-conversion
iamsh4shank Feb 20, 2021
5936cb6
Merge pull request #1783 from robustTechie/kotlin-conversion
iamsh4shank Feb 20, 2021
b369f7c
minor bug fixed
iamsh4shank Feb 20, 2021
38bd273
Merge pull request #1784 from robustTechie/kotlin-conversion
iamsh4shank Feb 20, 2021
558cda4
minor bug fixed
iamsh4shank Feb 20, 2021
e2bb243
Merge pull request #1785 from robustTechie/kotlin-conversion
iamsh4shank Feb 20, 2021
29b592d
minor bug fixed
iamsh4shank Feb 20, 2021
46aed75
Merge pull request #1786 from robustTechie/kotlin-conversion
iamsh4shank Feb 20, 2021
d297d79
minor bug fixed
iamsh4shank Feb 20, 2021
a88b9fe
Merge branch 'kotlin-conversion' into kotlin-conversion
iamsh4shank Feb 20, 2021
4997548
Merge pull request #1787 from robustTechie/kotlin-conversion
iamsh4shank Feb 20, 2021
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
6 changes: 4 additions & 2 deletions mifosng-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ android {
lintOptions {
abortOnError false
disable 'InvalidPackage'
disable 'MissingTranslation'
disable 'OutdatedLibrary'
}


Expand Down Expand Up @@ -196,7 +198,7 @@ dependencies {
kapt 'androidx.lifecycle:lifecycle-compiler:2.0.0'

//Square dependencies
implementation('com.squareup.retrofit2:retrofit:$rootProject.retrofitVersionLatest') {
implementation("com.squareup.retrofit2:retrofit:$rootProject.retrofitVersionLatest") {
// exclude Retrofit’s OkHttp peer-dependency module and define your own module import
exclude module: 'okhttp'
}
Expand All @@ -216,7 +218,7 @@ dependencies {
implementation 'com.facebook.stetho:stetho-okhttp3:1.3.1'


implementation 'com.joanzapata.iconify:android-iconify-material:2.1.1' // (v2.0.0)
implementation "com.joanzapata.iconify:android-iconify-material:2.1.1" // (v2.0.0)
implementation('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
transitive = true
}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/*
* This project is licensed under the open source MPL V2.
* See https://github.com/openMF/android-client/blob/master/LICENSE.md
*/
package com.mifos.mifosxdroid

import android.os.Bundle
import com.mifos.mifosxdroid.core.MifosBaseActivity
import com.mifos.mifosxdroid.online.clientlist.ClientListFragment

class ClientListActivity : MifosBaseActivity() {
public override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_toolbar_container)
showBackButton()
replaceFragment(ClientListFragment(), false, R.id.container)
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.mifos.mifosxdroid

import com.mifos.mifosxdroid.core.MifosBaseActivity
import android.os.Bundle
import com.mifos.mifosxdroid.SettingsFragment

/**
* Created by mayankjindal on 22/07/17.
*/
class SettingsActivity : MifosBaseActivity() {
public override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_toolbar_container)
showBackButton()
fragmentManager.beginTransaction()
.replace(R.id.container, SettingsFragment())
.commit()
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package com.mifos.mifosxdroid

import android.os.Bundle
import android.preference.Preference.OnPreferenceChangeListener
import android.preference.PreferenceFragment
import android.preference.SwitchPreference
import com.mifos.mifosxdroid.dialogfragments.syncsurveysdialog.SyncSurveysDialogFragment
import com.mifos.utils.FragmentConstants

/**
* Created by mayankjindal on 22/07/17.
*/
class SettingsFragment : PreferenceFragment() {
var mEnableSyncSurvey: SwitchPreference? = null
override fun onCreate(savedInstanceState: Bundle?) {

super.onCreate(savedInstanceState)
addPreferencesFromResource(R.xml.preferences)
mEnableSyncSurvey = findPreference(resources.getString(R.string.sync_survey)) as SwitchPreference
mEnableSyncSurvey!!.onPreferenceChangeListener =
OnPreferenceChangeListener { preference, newValue ->
if (newValue as Boolean) {
val syncSurveysDialogFragment = SyncSurveysDialogFragment.newInstance()
val fragmentTransaction = fragmentManager.beginTransaction()
fragmentTransaction.addToBackStack(FragmentConstants.FRAG_SURVEYS_SYNC)
syncSurveysDialogFragment.isCancelable = false
syncSurveysDialogFragment.show(fragmentTransaction,
resources.getString(R.string.sync_clients))
}
true
}
}

companion object {
fun newInstance(): SettingsFragment {
val fragment = SettingsFragment()
val args = Bundle()
fragment.arguments = args
return fragment
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,22 @@

package com.mifos.mifosxdroid.activity.pathtracking;

import android.Manifest;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.Service;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.location.Location;
import android.os.Bundle;
import android.os.IBinder;

import androidx.core.app.ActivityCompat;
import androidx.core.app.NotificationCompat;

import android.util.Log;
import android.widget.Toast;

Expand Down Expand Up @@ -102,6 +107,33 @@ protected void createLocationRequest() {
}

protected void startLocationUpdates() {
if (ActivityCompat.checkSelfPermission(this, Manifest.permission
.ACCESS_FINE_LOCATION) != PackageManager
.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest
.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
// TODO: Consider calling
// ActivityCompat#requestPermissions
// here to request the missing permissions, and then overriding
// public void onRequestPermissionsResult(int requestCode, String[] permissions,
// int[] grantResults)
// to handle the case where the user grants the permission. See the documentation
// for ActivityCompat#requestPermissions for more details.
return;
}
if (ActivityCompat.checkSelfPermission(this, Manifest.permission
.ACCESS_FINE_LOCATION) != PackageManager
.PERMISSION_GRANTED && ActivityCompat
.checkSelfPermission(this, Manifest.permission
.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
// TODO: Consider calling
// ActivityCompat#requestPermissions
// here to request the missing permissions, and then overriding
// public void onRequestPermissionsResult(int requestCode, String[] permissions,
// int[] grantResults)
// to handle the case where the user grants the permission. See the documentation
// for ActivityCompat#requestPermissions for more details.
return;
}
LocationServices.FusedLocationApi.requestLocationUpdates(
googleApiClient, locationRequest, this);
}
Expand All @@ -124,6 +156,34 @@ public int onStartCommand(Intent intent, int flags, int startId) {
@Override
public void onConnected(Bundle bundle) {
if (currentLocation == null) {
if (ActivityCompat.checkSelfPermission(this, Manifest
.permission.ACCESS_FINE_LOCATION) != PackageManager
.PERMISSION_GRANTED && ActivityCompat
.checkSelfPermission(this, Manifest.permission
.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
// TODO: Consider calling
// ActivityCompat#requestPermissions
// here to request the missing permissions, and then overriding
// public void onRequestPermissionsResult(int requestCode, String[] permissions,
// int[] grantResults)
// to handle the case where the user grants the permission. See the documentation
// for ActivityCompat#requestPermissions for more details.
return;
}
if (ActivityCompat.checkSelfPermission(this, Manifest
.permission.ACCESS_FINE_LOCATION) != PackageManager
.PERMISSION_GRANTED && ActivityCompat
.checkSelfPermission(this, Manifest.permission
.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
// TODO: Consider calling
// ActivityCompat#requestPermissions
// here to request the missing permissions, and then overriding
// public void onRequestPermissionsResult(int requestCode, String[] permissions,
// int[] grantResults)
// to handle the case where the user grants the permission. See the documentation
// for ActivityCompat#requestPermissions for more details.
return;
}
currentLocation = LocationServices.FusedLocationApi.getLastLocation(googleApiClient);
latLngs.add(new UserLatLng(currentLocation.getLatitude(),
currentLocation.getLongitude()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ public static CollectionSheetDialogFragment newInstance(String date, int members

@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
((MifosBaseActivity) getActivity()).getActivityComponent().inject(this);
date = getArguments().getString(Constants.REPAYMENT_DATE);
members = getArguments().getInt(Constants.MEMBERS);
Expand Down

This file was deleted.

Loading