mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2025-12-23 23:28:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
Sylvia van Os
2021-08-22 16:16:27 +02:00
parent f4945c2cd2
commit 83ea6ffbf7
12 changed files with 33 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -7,3 +7,4 @@ build/
captures/
**/release
**/debug
app/*.log

5
app/src/main/java/protect/card_locker/AboutActivity.java
View File

@@ -21,11 +21,6 @@ public class AboutActivity extends CatimaAppCompatActivity
{
private static final String TAG = "Catima";
@Override
protected void attachBaseContext(Context base) {
super.attachBaseContext(Utils.updateBaseContextLocale(base));
}
@Override
protected void onCreate(Bundle savedInstanceState)
{

5
app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
View File

@@ -63,11 +63,6 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity
private Map<String, Pair<Integer, Integer>> barcodeViewMap;
private LinkedList<AsyncTask> barcodeGeneratorTasks = new LinkedList<>();
@Override
protected void attachBaseContext(Context base) {
super.attachBaseContext(Utils.updateBaseContextLocale(base));
}
@Override
protected void onCreate(Bundle savedInstanceState)
{

55
app/src/main/java/protect/card_locker/CatimaAppCompatActivity.java
View File

@@ -1,5 +1,6 @@
package protect.card_locker;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.res.Resources;
import android.util.TypedValue;
@@ -11,34 +12,40 @@ public class CatimaAppCompatActivity extends AppCompatActivity {
SharedPreferences pref;
@Override
@Override
protected void attachBaseContext(Context base) {
// Apply chosen language
super.attachBaseContext(Utils.updateBaseContextLocale(base));
}
@Override
public Resources.Theme getTheme() {
Resources.Theme theme = super.getTheme();
pref = PreferenceManager
.getDefaultSharedPreferences(getApplicationContext());
String themeName = pref.getString("pref_theme_color", getString(R.string.settings_key_catima_theme));
if(themeName.equals(getString(R.string.settings_key_brown_theme))){
theme.applyStyle(R.style.AppTheme_brown, true);
}else if(themeName.equals(getString(R.string.settings_key_pink_theme))){
theme.applyStyle(R.style.AppTheme_pink, true);
}else if(themeName.equals(getString(R.string.settings_key_magenta_theme))){
theme.applyStyle(R.style.AppTheme_magenta, true);
}else if(themeName.equals(getString(R.string.settings_key_violet_theme))){
theme.applyStyle(R.style.AppTheme_violet, true);
}else if(themeName.equals(getString(R.string.settings_key_blue_theme))){
theme.applyStyle(R.style.AppTheme_blue, true);
}else if(themeName.equals(getString(R.string.settings_key_sky_blue_theme))){
theme.applyStyle(R.style.AppTheme_sky_blue, true);
}else if(themeName.equals(getString(R.string.settings_key_green_theme))){
theme.applyStyle(R.style.AppTheme_green, true);
}else if(themeName.equals(getString(R.string.settings_key_grey_theme))){
theme.applyStyle(R.style.AppTheme_grey, true);
}else {
theme.applyStyle(R.style.AppTheme_NoActionBar, true);
}
// you could also use a switch if you have many themes that could apply
pref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
String themeName = pref.getString("pref_theme_color", getString(R.string.settings_key_catima_theme));
if (themeName.equals(getString(R.string.settings_key_brown_theme))){
theme.applyStyle(R.style.AppTheme_brown, true);
} else if(themeName.equals(getString(R.string.settings_key_pink_theme))){
theme.applyStyle(R.style.AppTheme_pink, true);
} else if(themeName.equals(getString(R.string.settings_key_magenta_theme))){
theme.applyStyle(R.style.AppTheme_magenta, true);
} else if(themeName.equals(getString(R.string.settings_key_violet_theme))){
theme.applyStyle(R.style.AppTheme_violet, true);
} else if(themeName.equals(getString(R.string.settings_key_blue_theme))){
theme.applyStyle(R.style.AppTheme_blue, true);
} else if(themeName.equals(getString(R.string.settings_key_sky_blue_theme))){
theme.applyStyle(R.style.AppTheme_sky_blue, true);
} else if(themeName.equals(getString(R.string.settings_key_green_theme))){
theme.applyStyle(R.style.AppTheme_green, true);
} else if(themeName.equals(getString(R.string.settings_key_grey_theme))){
theme.applyStyle(R.style.AppTheme_grey, true);
} else {
theme.applyStyle(R.style.AppTheme_NoActionBar, true);
}
return theme;
}
public int getThemeColor(){
TypedValue typedValue = new TypedValue();
Resources.Theme theme = getTheme();

5
app/src/main/java/protect/card_locker/ImportExportActivity.java
View File

@@ -49,11 +49,6 @@ public class ImportExportActivity extends CatimaAppCompatActivity
private String importAlertMessage;
private DataFormat importDataFormat;
@Override
protected void attachBaseContext(Context base) {
super.attachBaseContext(Utils.updateBaseContextLocale(base));
}
@Override
protected void onCreate(Bundle savedInstanceState)
{

5
app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
View File

@@ -140,11 +140,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity
LoyaltyCard tempLoyaltyCard;
@Override
protected void attachBaseContext(Context base) {
super.attachBaseContext(Utils.updateBaseContextLocale(base));
}
private static LoyaltyCard updateTempState(LoyaltyCard loyaltyCard, LoyaltyCardField fieldName, Object value) {
return new LoyaltyCard(
(int) (fieldName == LoyaltyCardField.id ? value : loyaltyCard.id),

5
app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
View File

@@ -105,11 +105,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity
IMAGE_BACK
}
@Override
protected void attachBaseContext(Context base) {
super.attachBaseContext(Utils.updateBaseContextLocale(base));
}
private void extractIntentFields(Intent intent)
{
final Bundle b = intent.getExtras();

5
app/src/main/java/protect/card_locker/MainActivity.java
View File

@@ -50,11 +50,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
private View mHelpText;
private View mNoMatchingCardsText;
@Override
protected void attachBaseContext(Context base) {
super.attachBaseContext(Utils.updateBaseContextLocale(base));
}
private ActionMode.Callback mCurrentActionModeCallback = new ActionMode.Callback()
{
@Override

5
app/src/main/java/protect/card_locker/ManageGroupsActivity.java
View File

@@ -30,11 +30,6 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
private RecyclerView mGroupList;
GroupCursorAdapter mAdapter;
@Override
protected void attachBaseContext(Context base) {
super.attachBaseContext(Utils.updateBaseContextLocale(base));
}
@Override
protected void onCreate(Bundle savedInstanceState)
{

5
app/src/main/java/protect/card_locker/ScanActivity.java
View File

@@ -39,11 +39,6 @@ public class ScanActivity extends CatimaAppCompatActivity {
private String addGroup;
private boolean torch = false;
@Override
protected void attachBaseContext(Context base) {
super.attachBaseContext(Utils.updateBaseContextLocale(base));
}
private void extractIntentFields(Intent intent) {
final Bundle b = intent.getExtras();
cardId = b != null ? b.getString(LoyaltyCardEditActivity.BUNDLE_CARDID) : null;

5
app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
View File

@@ -27,11 +27,6 @@ import protect.card_locker.Utils;
public class SettingsActivity extends CatimaAppCompatActivity
{
@Override
protected void attachBaseContext(Context base) {
super.attachBaseContext(Utils.updateBaseContextLocale(base));
}
@Override
protected void onCreate(Bundle savedInstanceState)
{

2
build.gradle
View File

@@ -9,7 +9,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.0'
classpath 'com.android.tools.build:gradle:7.0.1'
classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.0'
// NOTE: Do not place your application dependencies here; they belong