Skip to content

Commit 019577e

Browse files
vaneck237vaneck237
committed
adjust app colors and add dark mode
1 parent 10e2cfe commit 019577e

19 files changed

Lines changed: 189 additions & 43 deletions

File tree

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:7.3.1'
10+
classpath 'com.android.tools.build:gradle:8.13.0'
1111
classpath 'com.apollographql.apollo:apollo-gradle-plugin:2.5.14'
1212

1313
// NOTE: Do not place your application dependencies here; they belong

‎claimManagement/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ android {
6868
demoProd {
6969
applicationIdSuffix ".demoProd"
7070
resValue "string", "app_name_claims", "Claims Demo"
71-
buildConfigField "String", "API_BASE_URL", '"http://demo.openimis.org/"'
71+
buildConfigField "String", "API_BASE_URL", '"https://demo.openimis.org/"'
7272
dimension 'std'
7373
}
7474

@@ -180,6 +180,7 @@ android {
180180
packagingOptions {
181181
exclude 'META-INF/DEPENDENCIES'
182182
}
183+
namespace 'org.openimis.imisclaims'
183184
}
184185

185186
apollo {

‎claimManagement/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="org.openimis.imisclaims">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<uses-permission android:name="android.permission.INTERNET" />
76
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

‎claimManagement/src/main/java/org/openimis/imisclaims/Global.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,14 @@
5959

6060
import static org.openimis.imisclaims.BuildConfig.RAR_PASSWORD;
6161

62+
import androidx.appcompat.app.AppCompatDelegate;
63+
6264
import org.openimis.imisclaims.tools.Log;
6365

6466
public class Global extends Application {
6567
private static final String SHPREF_NAME = "SHPref";
6668
private static final String SHPREF_LANGUAGE = "language";
69+
private static final String SHPREF_DARK_MODE = "night";
6770
private static final String DEFAULT_LANGUAGE_CODE = "en";
6871
private static final String SHPREF_CSRF = "csrfToken";
6972
private static Global instance;
@@ -330,4 +333,21 @@ public void setSavedLanguage(String languageCode) {
330333
editor.putString(SHPREF_LANGUAGE, languageCode);
331334
editor.apply();
332335
}
336+
337+
public void getDarkMode () {
338+
SharedPreferences sp = getDefaultSharedPreferences();
339+
boolean dark_mode = sp.getBoolean(SHPREF_DARK_MODE, false);
340+
if(dark_mode){
341+
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
342+
} else {
343+
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
344+
}
345+
}
346+
347+
public void setDarkMode(boolean darkMode){
348+
SharedPreferences sp = getDefaultSharedPreferences();
349+
SharedPreferences.Editor editor = sp.edit();
350+
editor.putBoolean(SHPREF_DARK_MODE, darkMode);
351+
editor.apply();
352+
}
333353
}

‎claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ protected void onCreate(Bundle savedInstanceState) {
150150
entered_Count.setText("0");
151151

152152
AdminName = findViewById(R.id.AdminName);
153+
global.getDarkMode();
153154

154155
if (checkRequirements()) {
155156
onAllRequirementsMet();

‎claimManagement/src/main/java/org/openimis/imisclaims/SettingsActivity.java‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
package org.openimis.imisclaims;
22

33
import android.app.AlertDialog;
4+
import android.content.Context;
45
import android.content.SharedPreferences;
56
import android.os.Bundle;
67
import android.util.Base64;
8+
import android.view.View;
79
import android.widget.Button;
10+
import android.widget.CompoundButton;
811
import android.widget.EditText;
12+
import android.widget.Switch;
13+
14+
import androidx.appcompat.app.AppCompatDelegate;
915

1016
import java.security.MessageDigest;
1117
import java.security.SecureRandom;
@@ -21,6 +27,11 @@ public class SettingsActivity extends ImisActivity {
2127
private String salt, password;
2228
public static String generatedSalt;
2329
Global global;
30+
private Switch mode_switch;
31+
SharedPreferences sharedPreferences;
32+
SharedPreferences.Editor editor;
33+
private static final String SHPREF_NAME = "SHPref";
34+
boolean dark_mode;
2435

2536
@Override
2637
protected void onCreate(Bundle savedInstanceState) {
@@ -32,6 +43,15 @@ protected void onCreate(Bundle savedInstanceState) {
3243
btnSaveRarPwd = (Button)findViewById(R.id.btnSaveRarPwd);
3344
etRarPassword = (EditText)findViewById(R.id.rarPassword);
3445
btnDefaultRarPassword = (Button) findViewById(R.id.btnDefaultRarPassword);
46+
mode_switch = findViewById(R.id.mode_switch);
47+
global = (Global) getApplicationContext();
48+
49+
sharedPreferences = getSharedPreferences(SHPREF_NAME, Context.MODE_PRIVATE);
50+
dark_mode = sharedPreferences.getBoolean("night", false);
51+
52+
if(dark_mode){
53+
mode_switch.setChecked(true);
54+
}
3555

3656
btnSaveRarPwd.setOnClickListener(view -> {
3757
if(etRarPassword.getText().length() == 0){
@@ -52,6 +72,19 @@ protected void onCreate(Bundle savedInstanceState) {
5272
ShowDialog("Password has been changed to the default rar password");
5373
});
5474

75+
mode_switch.setOnClickListener(new View.OnClickListener() {
76+
@Override
77+
public void onClick(View view) {
78+
if(dark_mode){
79+
global.setDarkMode(false);
80+
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
81+
} else {
82+
global.setDarkMode(true);
83+
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
84+
}
85+
}
86+
});
87+
5588
}
5689

5790
public static String getGeneratedSalt() {

‎claimManagement/src/main/res/drawable-v24/corner.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
<stroke android:width="1dp"
66
android:color="@color/grey2"/>
77
<corners android:radius="2dp"/>
8-
<solid android:color="@color/white" />
8+
<solid android:color="@color/edit_text_color" />
99
</shape>

‎claimManagement/src/main/res/drawable/corner.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
<stroke android:width="1dp"
66
android:color="@color/grey2"/>
77
<corners android:radius="2dp"/>
8-
<solid android:color="@color/white" />
8+
<solid android:color="@color/edit_text_color" />
99
</shape>

‎claimManagement/src/main/res/drawable/side_nav_bar.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
android:shape="rectangle">
33
<gradient
44
android:angle="135"
5-
android:centerColor="#031f3e"
6-
android:endColor="#00001b"
7-
android:startColor="#323570"
5+
android:centerColor="#006273"
6+
android:endColor="#006273"
7+
android:startColor="#00323A"
88
android:type="linear" />
99
</shape>

‎claimManagement/src/main/res/layout/fragment_claim_listing_recycler_item.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
android:layout_alignParentStart="true"
2424
android:layout_marginTop="@dimen/text_margin"
2525
android:layout_marginStart="@dimen/text_margin"
26-
android:textColor="@color/white"
26+
android:textColor="@color/text_color"
2727
android:textSize="@dimen/text_size_header">
2828

2929
</TextView>
@@ -35,7 +35,7 @@
3535
android:layout_alignParentEnd="true"
3636
android:layout_marginEnd="@dimen/text_margin"
3737
android:layout_marginTop="@dimen/text_margin"
38-
android:textColor="@color/white"
38+
android:textColor="@color/text_color"
3939
android:textSize="@dimen/text_size_header">
4040

4141
</TextView>
@@ -56,7 +56,7 @@
5656
android:layout_alignParentStart="true"
5757
android:layout_marginBottom="@dimen/text_margin"
5858
android:layout_marginStart="@dimen/text_margin"
59-
android:textColor="@color/white"
59+
android:textColor="@color/text_color"
6060
android:textSize="@dimen/text_size_content">
6161

6262
</TextView>
@@ -68,7 +68,7 @@
6868
android:layout_alignParentEnd="true"
6969
android:layout_marginBottom="@dimen/text_margin"
7070
android:layout_marginEnd="@dimen/text_margin"
71-
android:textColor="@color/white"
71+
android:textColor="@color/text_color"
7272
android:textSize="@dimen/text_size_content">
7373

7474
</TextView>

0 commit comments

Comments
 (0)