mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-24 09:17:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add settings for font sizes

Browse Source
This commit is contained in:
Branden Archer
2018-02-16 22:45:31 -05:00
parent 4843a1093d
commit 9951999ca4
14 changed files with 325 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle
View File

@@ -54,6 +54,7 @@ dependencies {
compile 'com.jaredrummler:colorpicker:1.0.2'
compile group: 'com.google.guava', name: 'guava', version: '20.0'
compile 'com.github.apl-devs:appintro:v4.2.0'
compile "com.vanniktech:vntnumberpickerpreference:1.0.0"
testCompile 'junit:junit:4.12'
testCompile "org.robolectric:robolectric:3.3.2"
}

4
app/src/main/AndroidManifest.xml
View File

@@ -51,6 +51,10 @@
android:theme="@style/AppTheme.NoActionBar"
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="stateHidden"/>
<activity
android:name=".preferences.SettingsActivity"
android:label="@string/settings"
android:configChanges="orientation|screenSize"/>
<activity
android:name=".ImportExportActivity"
android:label="@string/importExport"

8
app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
View File

@@ -9,11 +9,16 @@ import android.widget.CursorAdapter;
import android.widget.ImageView;
import android.widget.TextView;
import protect.card_locker.preferences.Settings;
class LoyaltyCardCursorAdapter extends CursorAdapter
{
Settings settings;
public LoyaltyCardCursorAdapter(Context context, Cursor cursor)
{
super(context, cursor, 0);
settings = new Settings(context);
}
// The newView method is used to inflate a new view and return it,
@@ -40,10 +45,13 @@ class LoyaltyCardCursorAdapter extends CursorAdapter
// Populate fields with extracted properties
storeField.setText(loyaltyCard.store);
storeField.setTextSize(settings.getCardTitleListFontSize());
if(loyaltyCard.note.isEmpty() == false)
{
noteField.setVisibility(View.VISIBLE);
noteField.setText(loyaltyCard.note);
noteField.setTextSize(settings.getCardNoteListFontSize());
}
else
{

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

@@ -6,10 +6,12 @@ import android.content.pm.ActivityInfo;
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.widget.TextViewCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.util.TypedValue;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
@@ -22,6 +24,8 @@ import android.widget.Toast;
import com.google.zxing.BarcodeFormat;
import protect.card_locker.preferences.Settings;
public class LoyaltyCardViewActivity extends AppCompatActivity
{
@@ -36,6 +40,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
int loyaltyCardId;
boolean rotationEnabled;
DBHelper db;
Settings settings;
private void extractIntentFields(Intent intent)
{
@@ -49,6 +54,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
{
super.onCreate(savedInstanceState);
settings = new Settings(this);
extractIntentFields(getIntent());
setContentView(R.layout.loyalty_card_view_layout);
@@ -110,10 +117,16 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
final String cardIdString = loyaltyCard.cardId;
cardIdFieldView.setText(loyaltyCard.cardId);
TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(cardIdFieldView,
getResources().getInteger(R.integer.settings_card_id_min_font_size_sp)-1, settings.getCardIdFontSize(),
1, TypedValue.COMPLEX_UNIT_SP);
if(loyaltyCard.note.length() > 0)
{
noteView.setText(loyaltyCard.note);
TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(noteView,
getResources().getInteger(R.integer.settings_card_note_min_font_size_sp)-1,
settings.getCardNoteFontSize(), 1, TypedValue.COMPLEX_UNIT_SP);
}
else
{
@@ -122,6 +135,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
}
storeName.setText(loyaltyCard.store);
storeName.setTextSize(settings.getCardTitleFontSize());
int textColor;
if(loyaltyCard.headerTextColor != null)

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

@@ -30,6 +30,7 @@ import java.util.Calendar;
import java.util.Map;
import protect.card_locker.intro.IntroActivity;
import protect.card_locker.preferences.SettingsActivity;
public class MainActivity extends AppCompatActivity
{
@@ -164,6 +165,13 @@ public class MainActivity extends AppCompatActivity
return true;
}
if(id == R.id.action_settings)
{
Intent i = new Intent(getApplicationContext(), SettingsActivity.class);
startActivity(i);
return true;
}
if(id == R.id.action_intro)
{
startIntro();
@@ -188,6 +196,7 @@ public class MainActivity extends AppCompatActivity
.put("ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded")
.put("AppIntro", "https://github.com/apl-devs/AppIntro")
.put("Color Picker", "https://github.com/jaredrummler/ColorPicker")
.put("VNTNumberPickerPreference", "https://github.com/vanniktech/VNTNumberPickerPreference")
.build();
final Map<String, String> USED_ASSETS = ImmutableMap.of

61
app/src/main/java/protect/card_locker/preferences/Settings.java Normal file
View File

@@ -0,0 +1,61 @@
package protect.card_locker.preferences;
import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import android.support.annotation.IntegerRes;
import android.support.annotation.StringRes;
import protect.card_locker.R;
public class Settings
{
private Context context;
private SharedPreferences settings;
public Settings(Context context)
{
this.context = context;
this.settings = PreferenceManager.getDefaultSharedPreferences(context);
}
private String getResString(@StringRes int resId)
{
return context.getString(resId);
}
private int getResInt(@IntegerRes int resId)
{
return context.getResources().getInteger(resId);
}
private int getInt(@StringRes int keyId, @IntegerRes int defaultId)
{
return settings.getInt(getResString(keyId), getResInt(defaultId));
}
public int getCardTitleListFontSize()
{
return getInt(R.string.settings_key_card_title_list_font_size, R.integer.settings_card_title_list_font_size_sp);
}
public int getCardNoteListFontSize()
{
return getInt(R.string.settings_key_card_note_list_font_size, R.integer.settings_card_note_list_font_size_sp);
}
public int getCardTitleFontSize()
{
return getInt(R.string.settings_key_card_title_font_size, R.integer.settings_card_title_font_size_sp);
}
public int getCardIdFontSize()
{
return getInt(R.string.settings_key_card_id_font_size, R.integer.settings_card_id_font_size_sp);
}
public int getCardNoteFontSize()
{
return getInt(R.string.settings_key_card_note_font_size, R.integer.settings_card_note_font_size_sp);
}
}

56
app/src/main/java/protect/card_locker/preferences/SettingsActivity.java Normal file
View File

@@ -0,0 +1,56 @@
package protect.card_locker.preferences;
import android.os.Bundle;
import android.preference.PreferenceFragment;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem;
import protect.card_locker.R;
public class SettingsActivity extends AppCompatActivity
{
@Override
protected void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
ActionBar actionBar = getSupportActionBar();
if(actionBar != null)
{
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
// Display the fragment as the main content.
getFragmentManager().beginTransaction()
.replace(android.R.id.content, new SettingsFragment())
.commit();
}
@Override
public boolean onOptionsItemSelected(MenuItem item)
{
int id = item.getItemId();
if(id == android.R.id.home)
{
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
public static class SettingsFragment extends PreferenceFragment
{
@Override
public void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
// Load the preferences from an XML resource
addPreferencesFromResource(R.xml.preferences);
}
}
}

4
app/src/main/res/menu/main_menu.xml
View File

@@ -12,6 +12,10 @@
android:icon="@drawable/ic_import_export_white_24dp"
android:title="@string/importExport"
app:showAsAction="ifRoom"/>
<item
android:id="@+id/action_settings"
android:title="@string/settings"
app:showAsAction="never"/>
<item
android:id="@+id/action_intro"
android:title="@string/startIntro"

19
app/src/main/res/values/settings.xml
View File

@@ -10,4 +10,23 @@
<item>#2093cd</item>
<item>#ad62a7</item>
</array>
<!-- Default values -->
<integer name="settings_card_title_list_font_size_sp">28</integer>
<integer name="settings_card_note_list_font_size_sp">14</integer>
<integer name="settings_card_title_font_size_sp">40</integer>
<integer name="settings_card_id_font_size_sp">50</integer>
<integer name="settings_card_note_font_size_sp">50</integer>
<!-- Constraints -->
<integer name="settings_card_title_list_max_font_size_sp">40</integer>
<integer name="settings_card_title_list_min_font_size_sp">16</integer>
<integer name="settings_card_note_list_max_font_size_sp">25</integer>
<integer name="settings_card_note_list_min_font_size_sp">10</integer>
<integer name="settings_card_title_max_font_size_sp">50</integer>
<integer name="settings_card_title_min_font_size_sp">16</integer>
<integer name="settings_card_id_max_font_size_sp">50</integer>
<integer name="settings_card_id_min_font_size_sp">16</integer>
<integer name="settings_card_note_max_font_size_sp">50</integer>
<integer name="settings_card_note_min_font_size_sp">26</integer>
</resources>

14
app/src/main/res/values/strings.xml
View File

@@ -106,4 +106,18 @@
<string name="storeTextBackgroundColorTitle">Heading Color</string>
<string name="storeNameBackgroundColorDescription">Color for store text background</string>
<string name="storeNameColorDescription">Color for store text</string>
<string name="settings">Settings</string>
<string name="settings_category_title_ui">User interface</string>
<string name="settings_card_title_list_font_size">Card title list font size</string>
<string name="settings_key_card_title_list_font_size" translatable="false">pref_card_title_list_font_size_sp</string>
<string name="settings_card_note_list_font_size">Card note list font size</string>
<string name="settings_key_card_note_list_font_size" translatable="false">pref_card_note_list_font_size_sp</string>
<string name="settings_card_title_font_size">Card title font size</string>
<string name="settings_key_card_title_font_size" translatable="false">pref_card_title_font_size_sp</string>
<string name="settings_card_id_font_size">Card ID font size</string>
<string name="settings_key_card_id_font_size" translatable="false">pref_card_id_font_size_sp</string>
<string name="settings_card_note_font_size">Card note font size</string>
<string name="settings_key_card_note_font_size" translatable="false">pref_card_note_font_size_sp</string>
</resources>

46
app/src/main/res/xml/preferences.xml Normal file
View File

@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory
android:title="@string/settings_category_title_ui">
<com.vanniktech.vntnumberpickerpreference.VNTNumberPickerPreference
android:key="@string/settings_key_card_title_list_font_size"
android:title="@string/settings_card_title_list_font_size"
android:defaultValue="@integer/settings_card_title_list_font_size_sp"
app:vnt_maxValue="@integer/settings_card_title_list_max_font_size_sp"
app:vnt_minValue="@integer/settings_card_title_list_min_font_size_sp" />
<com.vanniktech.vntnumberpickerpreference.VNTNumberPickerPreference
android:key="@string/settings_key_card_note_list_font_size"
android:title="@string/settings_card_note_list_font_size"
android:defaultValue="@integer/settings_card_note_list_font_size_sp"
app:vnt_maxValue="@integer/settings_card_note_list_max_font_size_sp"
app:vnt_minValue="@integer/settings_card_note_list_min_font_size_sp" />
<com.vanniktech.vntnumberpickerpreference.VNTNumberPickerPreference
android:key="@string/settings_key_card_title_font_size"
android:title="@string/settings_card_title_font_size"
android:defaultValue="@integer/settings_card_title_font_size_sp"
app:vnt_maxValue="@integer/settings_card_title_max_font_size_sp"
app:vnt_minValue="@integer/settings_card_title_min_font_size_sp"/>
<com.vanniktech.vntnumberpickerpreference.VNTNumberPickerPreference
android:key="@string/settings_key_card_id_font_size"
android:title="@string/settings_card_id_font_size"
android:defaultValue="@integer/settings_card_id_font_size_sp"
app:vnt_maxValue="@integer/settings_card_id_max_font_size_sp"
app:vnt_minValue="@integer/settings_card_id_min_font_size_sp" />
<com.vanniktech.vntnumberpickerpreference.VNTNumberPickerPreference
android:key="@string/settings_key_card_note_font_size"
android:title="@string/settings_card_note_font_size"
android:defaultValue="@integer/settings_card_note_font_size_sp"
app:vnt_maxValue="@integer/settings_card_note_max_font_size_sp"
app:vnt_minValue="@integer/settings_card_note_min_font_size_sp" />
</PreferenceCategory>
</PreferenceScreen>

49
app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java
View File

@@ -1,8 +1,10 @@
package protect.card_locker;
import android.app.Activity;
import android.content.SharedPreferences;
import android.database.Cursor;
import android.graphics.Color;
import android.preference.PreferenceManager;
import android.view.View;
import android.widget.TextView;
@@ -23,12 +25,22 @@ public class LoyaltyCardCursorAdapterTest
{
private Activity activity;
private DBHelper db;
private SharedPreferences settings;
@Before
public void setUp()
{
activity = Robolectric.setupActivity(MainActivity.class);
db = new DBHelper(activity);
settings = PreferenceManager.getDefaultSharedPreferences(activity);
}
private void setFontSizes(int storeFontSize, int noteFontSize)
{
settings.edit()
.putInt(activity.getResources().getString(R.string.settings_key_card_title_list_font_size), storeFontSize)
.putInt(activity.getResources().getString(R.string.settings_key_card_note_list_font_size), noteFontSize)
.apply();
}
private View createView(Cursor cursor)
@@ -41,12 +53,21 @@ public class LoyaltyCardCursorAdapterTest
return view;
}
private void checkView(final View view, final String store, final String note)
private void checkView(final View view, final String store, final String note, boolean checkFontSizes)
{
final TextView storeField = view.findViewById(R.id.store);
assertEquals(store, storeField.getText().toString());
final TextView noteField = view.findViewById(R.id.note);
if(checkFontSizes)
{
int storeFontSize = settings.getInt(activity.getResources().getString(R.string.settings_key_card_title_list_font_size), 0);
int noteFontSize = settings.getInt(activity.getResources().getString(R.string.settings_key_card_note_list_font_size), 0);
assertEquals(storeFontSize, (int)storeField.getTextSize());
assertEquals(noteFontSize, (int)noteField.getTextSize());
}
assertEquals(store, storeField.getText().toString());
if(note.isEmpty() == false)
{
assertEquals(View.VISIBLE, noteField.getVisibility());
@@ -70,7 +91,7 @@ public class LoyaltyCardCursorAdapterTest
View view = createView(cursor);
checkView(view, card.store, card.note);
checkView(view, card.store, card.note, false);
}
@Test
@@ -84,6 +105,24 @@ public class LoyaltyCardCursorAdapterTest
View view = createView(cursor);
checkView(view, card.store, card.note);
checkView(view, card.store, card.note, false);
}
@Test
public void TestCursorAdapterFontSizes()
{
db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
LoyaltyCard card = db.getLoyaltyCard(1);
Cursor cursor = db.getLoyaltyCardCursor();
cursor.moveToFirst();
setFontSizes(1, 2);
View view = createView(cursor);
checkView(view, card.store, card.note, true);
setFontSizes(30, 31);
view = createView(cursor);
checkView(view, card.store, card.note, true);
}
}

43
app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
View File

@@ -2,11 +2,14 @@ package protect.card_locker;
import android.app.Activity;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
import android.content.pm.ResolveInfo;
import android.graphics.Color;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v4.widget.TextViewCompat;
import android.view.Menu;
import android.view.View;
import android.widget.Button;
@@ -523,4 +526,44 @@ public class LoyaltyCardViewActivityTest
// Save and check the gift card
saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, BARCODE_TYPE, false);
}
@Test
public void startCheckFontSizes()
{
ActivityController activityController = createActivityWithLoyaltyCard(false);
Activity activity = (Activity)activityController.get();
DBHelper db = new DBHelper(activity);
db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);
final int STORE_FONT_SIZE = 50;
final int CARD_FONT_SIZE = 40;
final int NOTE_FONT_SIZE = 30;
SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(activity);
settings.edit()
.putInt(activity.getResources().getString(R.string.settings_key_card_title_font_size), STORE_FONT_SIZE)
.putInt(activity.getResources().getString(R.string.settings_key_card_id_font_size), CARD_FONT_SIZE)
.putInt(activity.getResources().getString(R.string.settings_key_card_note_font_size), NOTE_FONT_SIZE)
.apply();
activityController.start();
activityController.visible();
activityController.resume();
assertEquals(false, activity.isFinishing());
TextView storeName = activity.findViewById(R.id.storeName);
TextView cardIdFieldView = activity.findViewById(R.id.cardIdView);
TextView noteView = activity.findViewById(R.id.noteView);
TextViewCompat.getAutoSizeMaxTextSize(storeName);
TextViewCompat.getAutoSizeMaxTextSize(storeName);
assertEquals(STORE_FONT_SIZE, (int)storeName.getTextSize());
assertEquals(CARD_FONT_SIZE, TextViewCompat.getAutoSizeMaxTextSize(cardIdFieldView));
assertEquals(NOTE_FONT_SIZE, TextViewCompat.getAutoSizeMaxTextSize(noteView));
shadowOf(activity).clickMenuItem(android.R.id.home);
assertEquals(true, activity.isFinishing());
}
}

3
app/src/test/java/protect/card_locker/MainActivityTest.java
View File

@@ -66,12 +66,13 @@ public class MainActivityTest
assertTrue(menu != null);
// The settings and add button should be present
assertEquals(menu.size(), 4);
assertEquals(menu.size(), 5);
assertEquals("Add", menu.findItem(R.id.action_add).getTitle().toString());
assertEquals("Import/Export", menu.findItem(R.id.action_import_export).getTitle().toString());
assertEquals("Start Intro", menu.findItem(R.id.action_intro).getTitle().toString());
assertEquals("About", menu.findItem(R.id.action_about).getTitle().toString());
assertEquals("Settings", menu.findItem(R.id.action_settings).getTitle().toString());
}
@Test