Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spelling #17

Open
wants to merge 57 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
cdca352
spelling: accidentally
jsoref Jan 27, 2019
0d8e1c0
spelling: activity
jsoref Jan 27, 2019
01c370b
spelling: anyway
jsoref Jan 27, 2019
f7a726c
spelling: aysc (??)
jsoref Jan 27, 2019
4705488
spelling: bilingual
jsoref Jan 27, 2019
4d2eb4a
spelling: booktitle
jsoref Jan 27, 2019
1013450
spelling: careful
jsoref Jan 27, 2019
e7e1065
spelling: change
jsoref Jan 27, 2019
bd15c1a
spelling: chinuch
jsoref Jan 27, 2019
05c5cce
spelling: column
jsoref Jan 27, 2019
9d80bb7
spelling: contain
jsoref Jan 27, 2019
af7995f
spelling: dimensions
jsoref Jan 27, 2019
f55c7b5
spelling: divide
jsoref Jan 27, 2019
a6c64f0
spelling: doesn't
jsoref Jan 27, 2019
6218696
spelling: english
jsoref Jan 27, 2019
84f5cf8
spelling: escaping
jsoref Jan 27, 2019
ee1a6e3
spelling: everything
jsoref Jan 27, 2019
6bd8f93
spelling: hack
jsoref Jan 27, 2019
f649587
spelling: haftara
jsoref Jan 27, 2019
97f0be6
spelling: halakhah
jsoref Jan 27, 2019
cee5533
spelling: heades (?!)
jsoref Jan 27, 2019
2b6a914
spelling: ignoring
jsoref Jan 27, 2019
d1ec8af
spelling: indeterminate
jsoref Jan 27, 2019
91e3c2a
spelling: initialize
jsoref Jan 27, 2019
a189418
spelling: invisible
jsoref Jan 27, 2019
8efe2f9
spelling: library
jsoref Jan 27, 2019
9170e5c
spelling: logging
jsoref Jan 27, 2019
52da9e9
spelling: make
jsoref Jan 27, 2019
d5b4634
spelling: memory
jsoref Jan 27, 2019
37ae010
spelling: montserrat
jsoref Jan 27, 2019
d369da8
spelling: nikkuds
jsoref Jan 27, 2019
78225e7
spelling: occurred
jsoref Jan 27, 2019
4d9433f
spelling: conversion
jsoref Jan 27, 2019
3130e1d
spelling: debug
jsoref Jan 27, 2019
efae224
spelling: ofrequested
jsoref Jan 27, 2019
c23d6f4
spelling: overridden
jsoref Jan 27, 2019
c50d215
spelling: refer
jsoref Jan 27, 2019
e7f3852
spelling: regular
jsoref Jan 27, 2019
5acfa3d
spelling: represent
jsoref Jan 27, 2019
0f33bcc
spelling: returns
jsoref Jan 27, 2019
00f3e91
spelling: sefer
jsoref Jan 27, 2019
442fc49
spelling: separated
jsoref Jan 27, 2019
af6ba3b
spelling: separator
jsoref Jan 27, 2019
5834a2d
spelling: should
jsoref Jan 27, 2019
85b75c7
spelling: similarly
jsoref Jan 27, 2019
68f6d62
spelling: something
jsoref Jan 27, 2019
ca44b4a
spelling: stupidity
jsoref Jan 27, 2019
96881d5
spelling: transferring
jsoref Jan 27, 2019
f39db69
spelling: upgrade
jsoref Jan 27, 2019
2835ba7
spelling: util
jsoref Jan 27, 2019
4e62a98
spelling: version
jsoref Jan 27, 2019
c80f8a2
spelling: vertical
jsoref Jan 27, 2019
6de130e
spelling: visibility
jsoref Jan 27, 2019
816d0fd
spelling: visible
jsoref Jan 27, 2019
f3cf165
spelling: writing
jsoref Jan 27, 2019
06d2411
spelling: wi-fi
jsoref Jan 27, 2019
86a43a0
spelling: william
jsoref Jan 27, 2019
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This is the Sefaria Android app. It is still a work in progress.

Using Android Studio, the java code can be found in Project -> app -> java -> org.sefaria.sefaria.

The activities folder conatins the main code for each of the activities. Simularly, database folder contains classes for data types related to the data and the database. Other folders conatain helper items. For example, TOCElements conatains classes for the different elements that the TOCActivity uses.
The activities folder conatins the main code for each of the activities. Similarly, database folder contains classes for data types related to the data and the database. Other folders contain helper items. For example, TOCElements contains classes for the different elements that the TOCActivity uses.

## Downloading APK
You can download the app on the [play store] (https://play.google.com/store/apps/details?id=org.sefaria.sefaria&hl=en) or you can get the apk directly in [releases] (https://github.com/Sefaria/Sefaria-Android/releases).
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/java/org/sefaria/sefaria/Dialog/DialogManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public void onClick(DialogInterface dialog, int id) {
});

builder.setTitle("Welcome to Sefaria Mobile!");
builder.setMessage("To use the app, you need to download the Sefaria libary. Do you want to do this now?\nYou can always click 'Update Library' in settings to update.");
builder.setMessage("To use the app, you need to download the Sefaria library. Do you want to do this now?\nYou can always click 'Update Library' in settings to update.");
dialog = builder.create();
dialog.setCancelable(false);
dialog.show();
Expand Down Expand Up @@ -349,7 +349,7 @@ public void onClick(DialogInterface dialog, int id) {
builder.setNegativeButton(activity.getString(R.string.no), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dismissCurrentDialog();
//Log.d("dialog","neg aysc click");
//Log.d("dialog","neg aysc (??) click");
showDialog(activity,UPDATE_STARTED);
}
});
Expand Down Expand Up @@ -433,9 +433,9 @@ private static String getString(int messageType){
switch(messageType){
case LIBRARY_EMPTY_MESSAGE:
if(makeItHebrew)
return "(Hebrew Version:) To use the app, you need to download the BetaMidrash libary. Do you want to do this now?\nYou can always click 'Update Library' in settings.";
return "(Hebrew Version:) To use the app, you need to download the BetaMidrash library. Do you want to do this now?\nYou can always click 'Update Library' in settings.";
else
return "To use the app, you need to download the BetaMidrash libary. Do you want to do this now?\nYou can always click 'Update Library' in settings to update.";
return "To use the app, you need to download the BetaMidrash library. Do you want to do this now?\nYou can always click 'Update Library' in settings to update.";
case LIBRARY_EMPTY_TITLE:
if(makeItHebrew)
return "\u05E1\u05E4\u05E8\u05D9\u05D9\u05D4\20\u05E8\u05D9\u05E7\u05D4";
Expand Down Expand Up @@ -483,9 +483,9 @@ private static String getString(int messageType){
return "Cancel";
case USING_DATA_MESSAGE:
if(makeItHebrew)
return "You are using mobile data (not WIFI). The update is about 100MB. Do you want to download it anyways?";
return "You are using mobile data (not Wi-Fi). The update is about 100MB. Do you want to download it anyway?";
else
return "You are using mobile data (not WIFI). The update is about 100MB. Do you want to download it anyways?";
return "You are using mobile data (not Wi-Fi). The update is about 100MB. Do you want to download it anyway?";
case USING_DATA_TITLE:
if(makeItHebrew)
return "Using mobile data";
Expand Down Expand Up @@ -545,4 +545,4 @@ private static String getString(int messageType){

return "";
}
}*/
}*/
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public void onBindViewHolder(LinkHolder holder, int position) {


} else if(linkCount.getDepthType() == LinkFilter.DEPTH_TYPE.CAT || linkCount.getDepthType() == LinkFilter.DEPTH_TYPE.ALL ){ //ALL and CAT
String text = bookTitle.toUpperCase() + " " + Util.LINK_CAT_VERICAL_LINE + " <font color="+fadedTextHexColor+">" + linkCount.getCount() + "</font>";
String text = bookTitle.toUpperCase() + " " + Util.LINK_CAT_VERTICAL_LINE + " <font color="+fadedTextHexColor+">" + linkCount.getCount() + "</font>";
holder.tv.setText(Html.fromHtml(text));
holder.tv.setTextColor(Util.getColor(context, R.attr.text_color_main));
/*if (android.os.Build.VERSION.SDK_INT >= 14) {//for older things it just will by non-capped (even though we can make a function to fix it, it's not worth it).
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/org/sefaria/sefaria/MenuElements/MenuGrid.java
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ private void addTabsection(List<BilingualNode> nodeList) {
LayoutInflater inflater = (LayoutInflater)
context.getSystemService(Activity.LAYOUT_INFLATER_SERVICE);

inflater.inflate(R.layout.tab_divider_menu,tabRoot);
inflater.inflate(R.layout.tab_divideer_menu,tabRoot);
}

MenuButtonTab mbt = new MenuButtonTab(context,menuNode, menuState.getLang());
Expand Down Expand Up @@ -274,7 +274,7 @@ public void buildPage() {
}
MenuButtonTab mbt = menuButtonTabList.get(0);
mbt.setActive(true);
setVisablityOfWillaimTalmud(mbt);
setVisibilityOfWilliamTalmud(mbt);

williamDTalumd = getWilliamDTalumd(context, 60, 95);
this.addView(williamDTalumd, 1);
Expand Down Expand Up @@ -339,7 +339,7 @@ private void flipViews(boolean flipTabsAlso) {

public boolean getHasTabs() { return hasTabs; }

//used when you're rebuilding after memore dump
//used when you're rebuilding after memory dump
//you need to make sure that you add the correct tabs
public void setHasTabs(boolean hasTabs) {
this.hasTabs = hasTabs;
Expand Down Expand Up @@ -421,7 +421,7 @@ private boolean menuClick(View v, boolean longClick){
return false;
}

void setVisablityOfWillaimTalmud(MenuButtonTab currentMenuButtonTab){
void setVisibilityOfWilliamTalmud(MenuButtonTab currentMenuButtonTab){
if(williamDTalumd != null) {
if ("Bavli".equals(currentMenuButtonTab.getNode().getBookTitle()))
williamDTalumd.setVisibility(View.VISIBLE);
Expand Down Expand Up @@ -457,7 +457,7 @@ public void onClick(View v) {
tempMBT.setActive(false);

mbt.setActive(true);
setVisablityOfWillaimTalmud(mbt);
setVisibilityOfWilliamTalmud(mbt);

gridRoot.removeAllViews();
menuState = menuState.goBack(false, false);
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/org/sefaria/sefaria/MyApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ protected void attachBaseContext(Context base) {
public static final int[] CAT_COLORS = {R.color.tanach, R.color.mishnah,R.color.talmud,
R.color.tosefta,R.color.liturgy,R.color.liturgy,
R.color.philosophy,R.color.chasidut,R.color.musar,
R.color.system_color,R.color.halkhah,R.color.midrash,
R.color.system_color,R.color.halakhah,R.color.midrash,
R.color.kabbalah,R.color.responsa,R.color.parshanut,
R.color.apocrypha,R.color.system_color,R.color.quoting_commentary,
R.color.modern_works,R.color.commentary, R.color.system_color,
Expand All @@ -73,7 +73,7 @@ public enum Font {
MONTSERRAT,TAAMEY_FRANK,OPEN_SANS_EN,OPEN_SANS_HE,GARAMOND,NEW_ATHENA,CRIMSON,QUATTROCENTO,CARDO
}

private static Typeface monserrat_tf;
private static Typeface montserrat_tf;
private static Typeface taamey_frank_tf;
private static Typeface open_sans_en_tf;
private static Typeface open_sans_he_tf;
Expand Down Expand Up @@ -117,7 +117,7 @@ public static int getVersionCode(){


private static void initFonts() {
monserrat_tf = Typeface.createFromAsset(context.getAssets(), "fonts/Montserrat-Regular.otf");
montserrat_tf = Typeface.createFromAsset(context.getAssets(), "fonts/Montserrat-Regular.otf");
taamey_frank_tf = Typeface.createFromAsset(context.getAssets(), "fonts/TaameyFrankCLM-Medium.ttf");
open_sans_en_tf = Typeface.createFromAsset(context.getAssets(), "fonts/OpenSans-Regular.ttf");
open_sans_he_tf = Typeface.createFromAsset(context.getAssets(), "fonts/OpenSansHebrew-Regular.ttf");
Expand All @@ -131,7 +131,7 @@ private static void initFonts() {
public static Typeface getFont(Font font) {
switch (font) {
case MONTSERRAT:
return monserrat_tf;
return montserrat_tf;
case TAAMEY_FRANK:
return taamey_frank_tf;
case OPEN_SANS_EN:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public SearchAdapter(Context context, int resourceId, List<Segment> results) {
@Override
public View getView(int position, View view, ViewGroup parent) {
Segment segment = results.get(position);
//Language is exclusively either Hebrew or Enlgihs, depending on which exists in the segment
//Language is exclusively either Hebrew or English, depending on which exists in the segment
Util.Lang lang;
if (segment.getText(langSearchedIn).length() > 0 ){
lang = langSearchedIn;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ private void init(Context context) {
findViewById(R.id.arrow_left).setVisibility(VISIBLE);
LinearLayout yo = (LinearLayout) findViewById(R.id.filterTitle);
yo.setGravity(Gravity.RIGHT);
} else /* if (systemLang == Utile.Lang.EN) */ {
} else /* if (systemLang == Util.Lang.EN) */ {
findViewById(R.id.arrow_right).setVisibility(VISIBLE);
findViewById(R.id.arrow_left).setVisibility(GONE);
LinearLayout yo = (LinearLayout) findViewById(R.id.filterTitle);
Expand Down Expand Up @@ -308,7 +308,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
}
};

/*indetermCheckBox.setOnStateChangedListener(new IndeterminateCheckBox.OnStateChangedListener() {
/*IndeterminateCheckBox.setOnStateChangedListener(new IndeterminateCheckBox.OnStateChangedListener() {
@Override
public void onStateChanged(IndeterminateCheckBox check, @Nullable Boolean state) {
String stateText = (state != null) ? (state ? "Checked" : "Unchecked") : "Indeterminate";
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/java/org/sefaria/sefaria/TOCElements/TOCGrid.java
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,12 @@ private void init() {
int defaultTab = setCurrSectionText();

//ADD GREY DIVIDER
View divider = new View(context);
View divideer = new View(context);
LinearLayout.LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, 1);
lp.setMargins(0,Math.round(Util.dpToPixels(30)), 0,Math.round(Util.dpToPixels(20)));
divider.setLayoutParams(lp);
divider.setBackgroundColor(Color.parseColor("#CCCCCC"));
this.addView(divider, positionNum++);
divideer.setLayoutParams(lp);
divideer.setBackgroundColor(Color.parseColor("#CCCCCC"));
this.addView(divideer, positionNum++);

tabRoot = makeTabSections(tocNodesRoots);
this.addView(tabRoot, positionNum++);//It's the 3nd view starting with bookTitle and CurrSectionName
Expand Down Expand Up @@ -396,7 +396,7 @@ private LinearLayout makeTabSections(List<Node> nodeList) {
LayoutInflater inflater = (LayoutInflater)
context.getSystemService(Activity.LAYOUT_INFLATER_SERVICE);

inflater.inflate(R.layout.tab_divider_menu, tabs);
inflater.inflate(R.layout.tab_divideer_menu, tabs);
}

TOCTab tocTab;
Expand Down Expand Up @@ -549,7 +549,7 @@ private int setCurrSectionText() {


/*
//used when you're rebuilding after memore dump
//used when you're rebuilding after memory dump
//you need to make sure that you add the correct tabs
public void setHasTabs(boolean hasTabs) {
this.hasTabs = hasTabs;
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/java/org/sefaria/sefaria/Util.java
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public enum Lang {


public static final String VERSE_BULLET = "\u25CF";
public static final String LINK_CAT_VERICAL_LINE = "\u007C";
public static final String LINK_CAT_VERTICAL_LINE = "\u007C";
public static final float EN_HE_RATIO = 40f/35f; //universal constant


Expand Down Expand Up @@ -291,7 +291,7 @@ public static String int2heb(int num) {
place++;
}
//now search for 15 & 16 to replace
final String ka = "\u05D9\u05D4"; //carefull...don't join these strings
final String ka = "\u05D9\u05D4"; //careful...don't join these strings
final String ku = "\u05D9\u05D5";
final Pattern kaPatt = Pattern.compile("(" + ka + ")+");
final Pattern kuPatt = Pattern.compile("(" + ku + ")+");
Expand Down Expand Up @@ -406,10 +406,10 @@ public static int getRelativeTop(View myView) {
}


private static final Pattern DIR_SEPORATOR = Pattern.compile("/");
private static final Pattern DIR_SEPARATOR = Pattern.compile("/");

/**
* Raturns all available SD-Cards in the system (include emulated)
* Returns all available SD-Cards in the system (include emulated)
*
* Warning: Hack! Based on Android source code of version 4.3 (API 18)
* Because there is no standart way to get it.
Expand Down Expand Up @@ -452,7 +452,7 @@ public static String[] getStorageDirectories()
else
{
final String path = Environment.getExternalStorageDirectory().getAbsolutePath();
final String[] folders = DIR_SEPORATOR.split(path);
final String[] folders = DIR_SEPARATOR.split(path);
final String lastFolder = folders[folders.length - 1];
boolean isDigit = false;
try
Expand Down Expand Up @@ -619,15 +619,15 @@ public static Drawable tintDrawable(View view, @DrawableRes int drawable) {
throw new IllegalArgumentException("view must implement IndeterminateCheckable");
}

final ColorStateList colorStateList = createIndetermColorStateList(view.getContext());
final ColorStateList colorStateList = createIndeterminateColorStateList(view.getContext());

final Drawable d = DrawableCompat.wrap(ContextCompat.getDrawable(view.getContext(), drawable));
DrawableCompat.setTintList(d, colorStateList);

return d;
}

private static ColorStateList createIndetermColorStateList(Context context) {
private static ColorStateList createIndeterminateColorStateList(Context context) {

final int[][] states = new int[][]{
new int[]{-android.R.attr.state_enabled},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ protected void updateFocusedSegment() {


private SegmentSpannable getSpanNearY(TextView stv, int y) {
//pre-initaliaze
//pre-initialize
Rect parentTextViewRect = new Rect();
Layout textViewLayout = stv.getLayout();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,13 @@ private void addRecentTexts(View view){
else{
recentRoot.removeAllViews();
}
final int columNum = 1;
final int columnNum = 1;
List<MenuDirectRef> recents = Recents.getRecentDirectMenu(getContext(),true, false);
recentTexts = new ArrayList<>();
if(recents.size()>0) {
LinearLayout recentRow = null;
for (int i=0;i<recents.size();i++){
if(i%columNum == 0){
if(i%columnNum == 0){
recentRow = new LinearLayout(getContext());
recentRow.setOrientation(LinearLayout.HORIZONTAL);
recentRow.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public void gotoState(State state,View view,LinkFilter linkCount) {
currState = state;
View linkBackButton = view.findViewById(R.id.link_back_btn);
View colorBar = view.findViewById(R.id.main_color_bar);
View topDivider = view.findViewById(R.id.top_divider);
View topDivider = view.findViewById(R.id.top_divideer);
SefariaTextView noLinksTV = (SefariaTextView) view.findViewById(R.id.no_links_tv);
if (state == State.MAIN) {
view.setBackgroundColor(Util.getColor(activity, R.attr.link_bg));
Expand Down Expand Up @@ -251,7 +251,7 @@ public void updateFragment(Segment segment, View view) {
if (currState == State.MAIN) { //load new linkCounts
AsyncLoadLinkFilter alf = new AsyncLoadLinkFilter();
alf.execute();
} else if (currState == State.BOOK || currState == State.CAT) { //change visibilty of links
} else if (currState == State.BOOK || currState == State.CAT) { //change visibility of links
AsyncLoadLinks all = new AsyncLoadLinks(linkTextAdapter.getCurrLinkCount());
all.execute();
} else { //nothing you come here...
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ public void clearAllBookSettings(View v){
}

//onclick listener (see xml)
public void debubDBUnlockClick(View view) {
public void debugDBUnlockClick(View view) {
if (numDebugDBUnlockClicks >= TOT_NUM_DEBUG_DB_CLICKS) {
numDebugDBUnlockClicks = 0;
Settings.setIsDebug(!Settings.getIsDebug()); //toggle
Expand Down
Loading