Skip to content

Commit 6f949f0

Browse files
MJACodeRMJACodeR
committed
Fixed openMF#169 setting is empty and white
1 parent 2dd8750 commit 6f949f0

14 files changed

+326
-151
lines changed

‎app/build.gradle

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apply plugin: 'com.android.application'
2-
apply from: '../config/quality/quality.gradle'
2+
//apply from: '../config/quality/quality.gradle'
33
apply plugin: 'kotlin-android'
44
apply plugin: 'kotlin-android-extensions'
55
apply plugin: 'kotlin-kapt'
6-
apply plugin: 'com.google.android.gms.oss-licenses-plugin'
6+
//apply plugin: 'com.google.android.gms.oss-licenses-plugin'
77

88
android {
99
compileSdkVersion 28
@@ -15,6 +15,7 @@ android {
1515
versionName "1.0"
1616
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1717
vectorDrawables.useSupportLibrary = true
18+
multiDexEnabled true
1819
}
1920
buildTypes {
2021

‎app/src/main/AndroidManifest.xml

+28-24
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,47 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="org.mifos.mobile.cn">
3+
package="org.mifos.mobile.cn" >
44

5-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
6-
<uses-permission android:name="android.permission.INTERNET"/>
5+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
6+
<uses-permission android:name="android.permission.INTERNET" />
77
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
88

99
<application
10+
android:name=".MifosApplication"
1011
android:allowBackup="true"
1112
android:icon="@mipmap/ic_launcher"
1213
android:label="@string/app_name"
13-
android:name=".MifosApplication"
1414
android:roundIcon="@mipmap/ic_launcher_round"
1515
android:supportsRtl="true"
16-
android:theme="@style/AppTheme">
17-
<activity android:name=".ui.mifos.launcher.LauncherActivity"
18-
android:theme="@style/LauncherTheme">
16+
android:theme="@style/AppTheme" >
17+
18+
<activity
19+
android:name=".ui.mifos.launcher.LauncherActivity"
20+
android:theme="@style/LauncherTheme" >
1921
<intent-filter>
20-
<action android:name="android.intent.action.MAIN"/>
22+
<action android:name="android.intent.action.MAIN" />
2123

22-
<category android:name="android.intent.category.LAUNCHER"/>
24+
<category android:name="android.intent.category.LAUNCHER" />
2325
</intent-filter>
2426
</activity>
25-
2627
<activity android:name=".ui.mifos.DashboardActivity" />
27-
<activity android:name=".ui.mifos.login.LoginActivity"
28-
android:screenOrientation="portrait"/>
29-
<activity android:name=".ui.mifos.passcode.PasscodeActivity"
30-
android:screenOrientation="portrait"/>
31-
<activity android:name=".ui.mifos.loanApplication.loanActivity.LoanApplicationActivity"/>
32-
<activity android:name=".ui.mifos.customerDetails.CustomerDetailsActivity"/>
33-
<activity android:name=".ui.mifos.customerActivities.CustomerActivitiesActivity"/>
34-
<activity android:name=".ui.mifos.identificationlist.IdentificationsActivity"/>
35-
<activity android:name=".ui.mifos.viewScanCard.ViewScanCardActivity"/>
36-
<activity android:name=".ui.mifos.customerProfile.CustomerProfileActivity"/>
37-
<activity android:name=".ui.mifos.plannedPlayment.PlannedPaymentActivity"/>
38-
<activity android:name=".ui.mifos.debtincomereport.DebtIncomeReportActivity"/>
39-
<activity android:name=".ui.mifos.aboutus.AboutUsActivity"/>
40-
<activity android:name=".ui.mifos.privacypolicy.PrivacyPolicyActivity"/>
28+
<activity
29+
android:name=".ui.mifos.login.LoginActivity"
30+
android:screenOrientation="portrait" />
31+
<activity
32+
android:name=".ui.mifos.passcode.PasscodeActivity"
33+
android:screenOrientation="portrait" />
34+
<activity android:name=".ui.mifos.settings.SettingActivity"/>
35+
<activity android:name=".ui.mifos.loanApplication.loanActivity.LoanApplicationActivity" />
36+
<activity android:name=".ui.mifos.customerDetails.CustomerDetailsActivity" />
37+
<activity android:name=".ui.mifos.customerActivities.CustomerActivitiesActivity" />
38+
<activity android:name=".ui.mifos.identificationlist.IdentificationsActivity" />
39+
<activity android:name=".ui.mifos.viewScanCard.ViewScanCardActivity" />
40+
<activity android:name=".ui.mifos.customerProfile.CustomerProfileActivity" />
41+
<activity android:name=".ui.mifos.plannedPlayment.PlannedPaymentActivity" />
42+
<activity android:name=".ui.mifos.debtincomereport.DebtIncomeReportActivity" />
43+
<activity android:name=".ui.mifos.aboutus.AboutUsActivity" />
44+
<activity android:name=".ui.mifos.privacypolicy.PrivacyPolicyActivity" />
4145
<activity
4246
android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
4347
android:theme="@style/Theme.AppCompat.Light.DarkActionBar" />

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/DashboardActivity.kt

+40-43
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ import org.mifos.mobile.cn.ui.mifos.customerAccounts.CustomerAccountFragment
2727
import org.mifos.mobile.cn.ui.mifos.loanApplication.loanActivity.LoanApplicationActivity
2828
import org.mifos.mobile.cn.ui.mifos.products.ProductFragment
2929
import org.mifos.mobile.cn.ui.mifos.recentTransactions.RecentTransactionsFragment
30-
import org.mifos.mobile.cn.ui.mifos.settings.SettingsFragment
3130
import org.mifos.mobile.cn.ui.utils.CircularImageView
3231
import org.mifos.mobile.cn.ui.utils.Toaster
3332
import android.widget.Toast
33+
import org.mifos.mobile.cn.ui.mifos.settings.SettingActivity
3434

3535
class DashboardActivity : MifosBaseActivity(), View.OnClickListener, NavigationView.OnNavigationItemSelectedListener {
3636

37-
@Inject
38-
internal lateinit var preferencesHelper: PreferencesHelper
37+
// @Inject
38+
// internal lateinit var preferencesHelper: PreferencesHelper
3939

4040
private lateinit var tvUsername: TextView
4141
private lateinit var ivCircularUserProfilePicture: CircularImageView
@@ -60,24 +60,24 @@ class DashboardActivity : MifosBaseActivity(), View.OnClickListener, NavigationV
6060
/**
6161
* Asks users to confirm whether he want to logout or not
6262
*/
63-
private fun showLogoutDialog() {
64-
MaterialDialog.Builder().init(this)
65-
.setMessage(R.string.dialog_logout)
66-
.setPositiveButton(getString(R.string.logout),
67-
DialogInterface.OnClickListener { dialog, which ->
68-
preferencesHelper.clear()
69-
val intent = Intent(this, LoginActivity::class.java)
70-
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
71-
startActivity(intent)
72-
finish()
73-
//Show successful logout Toast.
74-
Toast.makeText(applicationContext, "Logged Out Successfully", Toast.LENGTH_SHORT).show()
75-
})
76-
.setNegativeButton(getString(R.string.cancel),
77-
DialogInterface.OnClickListener { dialog, which -> setNavigationViewSelectedItem(R.id.item_home) })
78-
.createMaterialDialog()
79-
.show()
80-
}
63+
// private fun showLogoutDialog() {
64+
// MaterialDialog.Builder().init(this)
65+
// .setMessage(R.string.dialog_logout)
66+
// .setPositiveButton(getString(R.string.logout),
67+
// DialogInterface.OnClickListener { dialog, which ->
68+
// preferencesHelper.clear()
69+
// val intent = Intent(this, LoginActivity::class.java)
70+
// intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
71+
// startActivity(intent)
72+
// finish()
73+
// //Show successful logout Toast.
74+
// Toast.makeText(applicationContext, "Logged Out Successfully", Toast.LENGTH_SHORT).show()
75+
// })
76+
// .setNegativeButton(getString(R.string.cancel),
77+
// DialogInterface.OnClickListener { dialog, which -> setNavigationViewSelectedItem(R.id.item_home) })
78+
// .createMaterialDialog()
79+
// .show()
80+
// }
8181

8282

8383
private fun setNavigationViewSelectedItem(id: Int) {
@@ -163,31 +163,28 @@ class DashboardActivity : MifosBaseActivity(), View.OnClickListener, NavigationV
163163
replaceFragment(DashboardFragment.newInstance(), true, R.id.container)
164164
}
165165
R.id.item_accounts -> {
166-
replaceFragment(CustomerAccountFragment.newInstance(AccountType.DEPOSIT), true,
167-
R.id.container)
168-
}
169-
R.id.item_logout -> {
170-
showLogoutDialog()
166+
replaceFragment(
167+
CustomerAccountFragment.newInstance(AccountType.DEPOSIT), true,
168+
R.id.container
169+
)
171170
}
171+
172172
R.id.item_product -> {
173-
replaceFragment(ProductFragment.Companion.newInstance(), true,
174-
R.id.container)
173+
replaceFragment(
174+
ProductFragment.Companion.newInstance(), true,
175+
R.id.container
176+
)
175177
}
176-
R.id.item_recent_transactions -> {
177-
replaceFragment(RecentTransactionsFragment.Companion.newInstance(),true,R.id.container)
178-
}
179-
R.id.item_about_us -> {
180-
showAboutUs()
178+
R.id.item_recent_transactions -> {
179+
replaceFragment(
180+
RecentTransactionsFragment.Companion.newInstance(),
181+
true,
182+
R.id.container
183+
)
181184
}
185+
182186
R.id.item_settings -> {
183-
replaceFragment(SettingsFragment.newInstance(), true, R.id.container)
184-
}
185-
R.id.item_share -> {
186-
val sharingIntent = Intent(android.content.Intent.ACTION_SEND)
187-
sharingIntent.type = "text/plain"
188-
sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, getString(R.string.app_link))
189-
sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, getString(R.string.share_message))
190-
startActivity(Intent.createChooser(sharingIntent, getString(R.string.share_the_app_link)))
187+
settingClicked()
191188
}
192189
}
193190
// close the drawer
@@ -220,8 +217,8 @@ class DashboardActivity : MifosBaseActivity(), View.OnClickListener, NavigationV
220217
super.onBackPressed()
221218
}
222219
}
223-
fun showAboutUs(){
224-
val intent = Intent(this, AboutUsActivity::class.java)
220+
fun settingClicked() {
221+
val intent = Intent(this, SettingActivity::class.java)
225222
startActivity(intent)
226223
}
227224

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/accounts/AccountsFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import android.view.View
99
import android.view.ViewGroup
1010
import com.github.therajanmaurya.sweeterror.SweetUIErrorHandler
1111
import kotlinx.android.synthetic.main.fragment_accounts.*
12+
import kotlinx.android.synthetic.main.layout_exception_handler.*
1213
import org.mifos.mobile.cn.R
1314
import org.mifos.mobile.cn.data.models.accounts.deposit.DepositAccount
1415
import org.mifos.mobile.cn.data.models.accounts.loan.LoanAccount
@@ -19,7 +20,6 @@ import org.mifos.mobile.cn.ui.base.MifosBaseFragment
1920
import org.mifos.mobile.cn.ui.utils.ConstantKeys
2021
import org.mifos.mobile.cn.ui.utils.Network
2122
import javax.inject.Inject
22-
import kotlinx.android.synthetic.main.layout_sweet_exception_handler.*
2323
import org.mifos.mobile.cn.data.models.CheckboxStatus
2424
import org.mifos.mobile.cn.ui.base.OnItemClickListener
2525
import org.mifos.mobile.cn.ui.mifos.customerDepositDetails.CustomerDepositDetailsFragment

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/settings/SettingActivity.kt

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
package org.mifos.mobile.cn.ui.mifos.settings
2+
3+
4+
import android.content.DialogInterface
5+
import android.content.Intent
6+
import android.os.Build
7+
import android.os.Bundle
8+
import android.provider.MediaStore
9+
import android.view.Menu
10+
import android.view.MenuItem
11+
import android.view.View
12+
import android.widget.Toast
13+
import android.widget.Toolbar
14+
import androidx.annotation.RequiresApi
15+
import androidx.appcompat.app.AlertDialog
16+
import androidx.appcompat.app.AppCompatActivity
17+
import kotlinx.android.synthetic.main.activity_customer_profile.*
18+
import kotlinx.android.synthetic.main.toolbar.*
19+
import org.mifos.mobile.cn.ui.utils.*
20+
import org.mifos.mobile.cn.R
21+
import org.mifos.mobile.cn.data.local.PreferencesHelper
22+
import org.mifos.mobile.cn.ui.mifos.DashboardActivity
23+
import org.mifos.mobile.cn.ui.mifos.aboutus.AboutUsActivity
24+
import org.mifos.mobile.cn.ui.mifos.customerProfile.CustomerProfileContract
25+
import org.mifos.mobile.cn.ui.mifos.login.LoginActivity
26+
import javax.inject.Inject
27+
28+
29+
class SettingActivity : AppCompatActivity() {
30+
override fun onCreate(savedInstanceState: Bundle?) {
31+
super.onCreate(savedInstanceState)
32+
setContentView(R.layout.activity_setting)
33+
}
34+
35+
fun notificationAct(view: View) {
36+
37+
}
38+
fun about_ac(view: View) {
39+
val intent = Intent(this, AboutUsActivity::class.java)
40+
startActivity(intent)
41+
}
42+
fun helpAc(view: View) {
43+
44+
}
45+
fun logout(view: View) {
46+
MaterialDialog.Builder().init(this)
47+
.setMessage(R.string.dialog_logout)
48+
.setPositiveButton(getString(R.string.logout),
49+
DialogInterface.OnClickListener { dialog, which ->
50+
val intent = Intent(this, LoginActivity::class.java)
51+
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
52+
startActivity(intent)
53+
finish()
54+
//Show successful logout Toast.
55+
Toast.makeText(applicationContext, "Logged Out Successfully", Toast.LENGTH_SHORT).show()
56+
})
57+
.setNegativeButton(getString(R.string.cancel),
58+
DialogInterface.OnClickListener { dialog, which ->
59+
Toast.makeText(applicationContext, "Canceled Successfully!", Toast.LENGTH_SHORT).show()
60+
61+
})
62+
.createMaterialDialog()
63+
.show()
64+
}
65+
66+
fun share(view: View) {
67+
val sharingIntent = Intent(android.content.Intent.ACTION_SEND)
68+
sharingIntent.type = "text/plain"
69+
sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, getString(R.string.app_link))
70+
sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, getString(R.string.share_message))
71+
startActivity(Intent.createChooser(sharingIntent, getString(R.string.share_the_app_link)))
72+
}
73+
74+
fun back(view: View) {
75+
val intent = Intent(this, DashboardActivity::class.java)
76+
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
77+
startActivity(intent)
78+
}
79+
}
80+

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/settings/SettingsFragment.kt

-41
This file was deleted.

‎app/src/main/res/drawable/ic_baseline_keyboard_backspace_24.xml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24.0"
5+
android:viewportHeight="24.0">
6+
<path
7+
android:fillColor="@color/white"
8+
android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
9+
</vector>

0 commit comments

Comments
 (0)