diff --git a/README.md b/README.md index 73da2cc..deb6815 100644 --- a/README.md +++ b/README.md @@ -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). diff --git a/app/src/main/java/org/sefaria/sefaria/Dialog/DialogManager.java b/app/src/main/java/org/sefaria/sefaria/Dialog/DialogManager.java index 95a2d3d..be24022 100755 --- a/app/src/main/java/org/sefaria/sefaria/Dialog/DialogManager.java +++ b/app/src/main/java/org/sefaria/sefaria/Dialog/DialogManager.java @@ -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(); @@ -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); } }); @@ -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"; @@ -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"; @@ -545,4 +545,4 @@ private static String getString(int messageType){ return ""; } -}*/ \ No newline at end of file +}*/ diff --git a/app/src/main/java/org/sefaria/sefaria/LinkElements/LinkMainAdapter.java b/app/src/main/java/org/sefaria/sefaria/LinkElements/LinkMainAdapter.java index 45cc604..f052233 100755 --- a/app/src/main/java/org/sefaria/sefaria/LinkElements/LinkMainAdapter.java +++ b/app/src/main/java/org/sefaria/sefaria/LinkElements/LinkMainAdapter.java @@ -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 + " " + linkCount.getCount() + ""; + String text = bookTitle.toUpperCase() + " " + Util.LINK_CAT_VERTICAL_LINE + " " + linkCount.getCount() + ""; 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). diff --git a/app/src/main/java/org/sefaria/sefaria/MenuElements/MenuGrid.java b/app/src/main/java/org/sefaria/sefaria/MenuElements/MenuGrid.java index a358aff..28abf0c 100755 --- a/app/src/main/java/org/sefaria/sefaria/MenuElements/MenuGrid.java +++ b/app/src/main/java/org/sefaria/sefaria/MenuElements/MenuGrid.java @@ -174,7 +174,7 @@ private void addTabsection(List 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()); @@ -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); @@ -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; @@ -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); @@ -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); diff --git a/app/src/main/java/org/sefaria/sefaria/MyApp.java b/app/src/main/java/org/sefaria/sefaria/MyApp.java index f64ab4e..f11c638 100755 --- a/app/src/main/java/org/sefaria/sefaria/MyApp.java +++ b/app/src/main/java/org/sefaria/sefaria/MyApp.java @@ -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, @@ -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; @@ -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"); @@ -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: diff --git a/app/src/main/java/org/sefaria/sefaria/SearchElements/SearchAdapter.java b/app/src/main/java/org/sefaria/sefaria/SearchElements/SearchAdapter.java index 84a07d2..b44a73a 100755 --- a/app/src/main/java/org/sefaria/sefaria/SearchElements/SearchAdapter.java +++ b/app/src/main/java/org/sefaria/sefaria/SearchElements/SearchAdapter.java @@ -35,7 +35,7 @@ public SearchAdapter(Context context, int resourceId, List 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; diff --git a/app/src/main/java/org/sefaria/sefaria/SearchElements/SearchFilterBox.java b/app/src/main/java/org/sefaria/sefaria/SearchElements/SearchFilterBox.java index 1fb2607..075fde4 100644 --- a/app/src/main/java/org/sefaria/sefaria/SearchElements/SearchFilterBox.java +++ b/app/src/main/java/org/sefaria/sefaria/SearchElements/SearchFilterBox.java @@ -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); @@ -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"; diff --git a/app/src/main/java/org/sefaria/sefaria/TOCElements/TOCGrid.java b/app/src/main/java/org/sefaria/sefaria/TOCElements/TOCGrid.java index fc51aad..97aecd9 100755 --- a/app/src/main/java/org/sefaria/sefaria/TOCElements/TOCGrid.java +++ b/app/src/main/java/org/sefaria/sefaria/TOCElements/TOCGrid.java @@ -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 @@ -396,7 +396,7 @@ private LinearLayout makeTabSections(List 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; @@ -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; diff --git a/app/src/main/java/org/sefaria/sefaria/Util.java b/app/src/main/java/org/sefaria/sefaria/Util.java index 064a601..9bfd7e3 100755 --- a/app/src/main/java/org/sefaria/sefaria/Util.java +++ b/app/src/main/java/org/sefaria/sefaria/Util.java @@ -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 @@ -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 + ")+"); @@ -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. @@ -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 @@ -619,7 +619,7 @@ 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); @@ -627,7 +627,7 @@ public static Drawable tintDrawable(View view, @DrawableRes int drawable) { 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}, diff --git a/app/src/main/java/org/sefaria/sefaria/activities/CtsTextActivity.java b/app/src/main/java/org/sefaria/sefaria/activities/CtsTextActivity.java index 944b39f..b2eb6b3 100755 --- a/app/src/main/java/org/sefaria/sefaria/activities/CtsTextActivity.java +++ b/app/src/main/java/org/sefaria/sefaria/activities/CtsTextActivity.java @@ -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(); diff --git a/app/src/main/java/org/sefaria/sefaria/activities/HomeFragment.java b/app/src/main/java/org/sefaria/sefaria/activities/HomeFragment.java index 2522dcf..1e19ec3 100755 --- a/app/src/main/java/org/sefaria/sefaria/activities/HomeFragment.java +++ b/app/src/main/java/org/sefaria/sefaria/activities/HomeFragment.java @@ -168,13 +168,13 @@ private void addRecentTexts(View view){ else{ recentRoot.removeAllViews(); } - final int columNum = 1; + final int columnNum = 1; List recents = Recents.getRecentDirectMenu(getContext(),true, false); recentTexts = new ArrayList<>(); if(recents.size()>0) { LinearLayout recentRow = null; for (int i=0;i= TOT_NUM_DEBUG_DB_CLICKS) { numDebugDBUnlockClicks = 0; Settings.setIsDebug(!Settings.getIsDebug()); //toggle diff --git a/app/src/main/java/org/sefaria/sefaria/activities/SuperTextActivity.java b/app/src/main/java/org/sefaria/sefaria/activities/SuperTextActivity.java index 7a0c020..d1d5850 100755 --- a/app/src/main/java/org/sefaria/sefaria/activities/SuperTextActivity.java +++ b/app/src/main/java/org/sefaria/sefaria/activities/SuperTextActivity.java @@ -172,7 +172,7 @@ protected void onCreate(Bundle savedInstanceState) { } - //These vars are specifically initialized here and not in init() so that they don't get overidden when coming from TOC + //These vars are specifically initialized here and not in init() so that they don't get overridden when coming from TOC //defaults isCts = Settings.getIsCts(book); isSideBySide = Settings.getIsSideBySide(); @@ -504,14 +504,14 @@ public void onDrawerStateChanged(int newState) { //this specifically comes before menugrid, b/c in tabs it menugrid does funny stuff to currnode if (customActionbar == null) { - MenuNode menuNode = new MenuNode("Error (if you see this)","Error (if you see this)",null); //TODO possibly replace this object with a more general bilinual node + MenuNode menuNode = new MenuNode("Error (if you see this)","Error (if you see this)",null); //TODO possibly replace this object with a more general bilingual node int catColor = book.getCatColor(); if(Settings.getUseAPI()|| true) //findOnPae temp removed for all versions searchClick = null; backClick = null; homeLongClick = null; - customActionbar = new CustomActionbar(this, menuNode, menuLang,homeClick,homeLongClick, null,searchClick,titleClick,menuClick,backClick,null,catColor,true,false, book.isTalmudBavli()); //TODO.. I'm not actually sure this should be lang.. instead it shuold be MENU_LANG from Util.S + customActionbar = new CustomActionbar(this, menuNode, menuLang,homeClick,homeLongClick, null,searchClick,titleClick,menuClick,backClick,null,catColor,true,false, book.isTalmudBavli()); //TODO.. I'm not actually sure this should be lang.. instead it should be MENU_LANG from Util.S LinearLayout abRoot = (LinearLayout) findViewById(R.id.actionbarRoot); abRoot.addView(customActionbar); customActionbar.setLang(menuLang); @@ -680,7 +680,7 @@ public void onClick(View v) { } if(searchActionBarRoot == null) searchActionBarRoot = (LinearLayout) findViewById(R.id.searchBarRoot); - searchActionBarRoot.removeAllViews();//in case you some how click on the search button while the search thing is already open (see if the old bar is visable through the search bar) + searchActionBarRoot.removeAllViews();//in case you some how click on the search button while the search thing is already open (see if the old bar is visible through the search bar) searchActionBarRoot.addView(searchActionbar); searchActionbar.requestFocus(); diff --git a/app/src/main/java/org/sefaria/sefaria/activities/TOCActivity.java b/app/src/main/java/org/sefaria/sefaria/activities/TOCActivity.java index f4e6267..914d7e5 100755 --- a/app/src/main/java/org/sefaria/sefaria/activities/TOCActivity.java +++ b/app/src/main/java/org/sefaria/sefaria/activities/TOCActivity.java @@ -190,7 +190,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == COMING_BACK_TO_TOC_REQUEST_CODE) { if (resultCode == RESULT_CANCELED) { Log.d("TOCAct","resultCode == RESULT_CANCELED"); - cameInFromBackPress = true;// so you know it was a back press from SuperTextActivity (so you know to create a new textActivty + cameInFromBackPress = true;// so you know it was a back press from SuperTextActivity (so you know to create a new textActivity } } }*/ diff --git a/app/src/main/java/org/sefaria/sefaria/database/Book.java b/app/src/main/java/org/sefaria/sefaria/database/Book.java index 3366948..790bee0 100755 --- a/app/src/main/java/org/sefaria/sefaria/database/Book.java +++ b/app/src/main/java/org/sefaria/sefaria/database/Book.java @@ -80,7 +80,7 @@ private Book(boolean dummy){ public static Book dummyBook = new Book(); /** - * returns a list of roots to trees that respresent the Table of Contents for a book. + * returns a list of roots to trees that represent the Table of Contents for a book. * @return roots */ public List getTOCroots() throws API.APIException { @@ -235,7 +235,7 @@ private void getFromCursor(Cursor cursor){ heSectionNamesL2B[i] = heSectionNamesTemp[heSectionNamesTemp.length - i -1]; //try: //path // try is needed in case it's an old DB. try{ - //if it's blank(or null) it will use the reguar title with " on .*" filtered out + //if it's blank(or null) it will use the regular title with " on .*" filtered out enCollectiveTitle = cursor.getString(18); heCollectiveTitle = cursor.getString(19); //not doing b/c its not needed for anything and is using a weird diff --git a/app/src/main/java/org/sefaria/sefaria/database/Cache.java b/app/src/main/java/org/sefaria/sefaria/database/Cache.java index 0affe2e..db872e0 100755 --- a/app/src/main/java/org/sefaria/sefaria/database/Cache.java +++ b/app/src/main/java/org/sefaria/sefaria/database/Cache.java @@ -106,7 +106,7 @@ private static String urlToTimeFile(String url,String json){ private static void clearTooManyFiles(){ - for(int i=0;i<10;i++){//10 times just so it doesn't accidently run for too long + for(int i=0;i<10;i++){//10 times just so it doesn't accidentally run for too long long size = 0; int fileCount = 0; for (File file : path.listFiles()) { diff --git a/app/src/main/java/org/sefaria/sefaria/database/DailyLearning.java b/app/src/main/java/org/sefaria/sefaria/database/DailyLearning.java index e2a9766..6a014df 100755 --- a/app/src/main/java/org/sefaria/sefaria/database/DailyLearning.java +++ b/app/src/main/java/org/sefaria/sefaria/database/DailyLearning.java @@ -71,7 +71,7 @@ private static MenuDirectRef getDafYomi(Context context){ return null; } - private static Node getParshaFromSefar(Book sefer, String parshaName) throws API.APIException{ + private static Node getParshaFromSefer(Book sefer, String parshaName) throws API.APIException{ Node node = sefer.getTOCroots().get(1); for(Node child : node.getChildren()){ if(child.getTitle(Util.Lang.EN).equals(parshaName)){ @@ -186,7 +186,7 @@ private static boolean shouldOverrideParsha() { String bookName = aliyah.replaceFirst("\\s[0-9]+.*$", ""); Book book = new Book(bookName); - Node node = getParshaFromSefar(book, multiParshas[0]); + Node node = getParshaFromSefer(book, multiParshas[0]); Settings.BookSettings bookSettings = Settings.BookSettings.getSavedBook(book); Integer textNum = null; if(bookSettings.node != null) { @@ -204,7 +204,7 @@ private static boolean shouldOverrideParsha() { if(multiParshas.length == 1){ heTitle = node.getParent().getTitle(Util.Lang.HE); }else{ - Node secondParshaNode = getParshaFromSefar(book, multiParshas[1]); + Node secondParshaNode = getParshaFromSefer(book, multiParshas[1]); heTitle = node.getParent().getTitle(Util.Lang.HE) + "-" + secondParshaNode.getParent().getTitle(Util.Lang.HE); } @@ -223,7 +223,7 @@ private static boolean shouldOverrideParsha() { //maybe also use: "shabbat_name": "Shabbat HaGadol" //Log.d("DailyLearning", "this weeks parsha: " + parsha + ""); - //TODO deal with multi part hafotra (have a binder with multi part haf) + //TODO deal with multi part haftara (have a binder with multi part haf) String fullHaftaraStr = ""; String heFullHaftaraStr = ""; Book firstHaftaraBook = null; diff --git a/app/src/main/java/org/sefaria/sefaria/database/Database.java b/app/src/main/java/org/sefaria/sefaria/database/Database.java index 7147997..48b9e4b 100755 --- a/app/src/main/java/org/sefaria/sefaria/database/Database.java +++ b/app/src/main/java/org/sefaria/sefaria/database/Database.java @@ -182,7 +182,7 @@ public static void onRequestPermissionsResult(Activity activity,int requestCode, static public String getInternalFolder(){ String path = getStorageDir(true); - Log.d("databasepath", path + " makdirs:" + mkDirs(path)); + Log.d("databasepath", path + " makedirs:" + mkDirs(path)); return path; } @@ -287,7 +287,7 @@ public static boolean checkDataBase(){ checkDB = SQLiteDatabase.openDatabase(myPath, null, SQLiteDatabase.OPEN_READONLY); }catch(Exception e){ GoogleTracker.sendException(e, "database doesn't exist"); - //database does't exist yet. + //database doesn't exist yet. } @@ -301,7 +301,7 @@ public static boolean checkDataBase(){ /** * Copies your database from your local assets-folder to the just created empty database in the * system folder, from where it can be accessed and handled. - * This is done by transfering bytestream. + * This is done by transferring bytestream. * */ private void copyDatabase(String path, String name) throws IOException{ //the following ensures all directories and files that we want will exist diff --git a/app/src/main/java/org/sefaria/sefaria/database/Downloader.java b/app/src/main/java/org/sefaria/sefaria/database/Downloader.java index 93782e8..89b0864 100755 --- a/app/src/main/java/org/sefaria/sefaria/database/Downloader.java +++ b/app/src/main/java/org/sefaria/sefaria/database/Downloader.java @@ -168,7 +168,7 @@ private static String getErrorReason(Cursor cursor){ public void onReceive(Context context, Intent intent) { long id = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, 0L); if (downloadIdList.indexOf(id) == -1) { - Log.v("download", "Ingnoring unrelated download " + id); + Log.v("download", "Ignoring unrelated download " + id); return; } else { //Toast.makeText(context, "did: " + downloadId, Toast.LENGTH_SHORT).show(); @@ -276,7 +276,7 @@ protected static void download(String url, String description, String destPath, if (canWrite()) { //Log.d("yo","all good"); } else { - Toast.makeText(context, context.getString(R.string.problem_writting_file), Toast.LENGTH_LONG).show(); + Toast.makeText(context, context.getString(R.string.problem_writing_file), Toast.LENGTH_LONG).show(); return; } Log.d("Downloader", "path:" + FULL_DOWNLOAD_PATH); diff --git a/app/src/main/java/org/sefaria/sefaria/database/Header.java b/app/src/main/java/org/sefaria/sefaria/database/Header.java index 859a787..9ad4685 100755 --- a/app/src/main/java/org/sefaria/sefaria/database/Header.java +++ b/app/src/main/java/org/sefaria/sefaria/database/Header.java @@ -141,7 +141,7 @@ public static String getNiceGridNum(Util.Lang lang, int num, boolean isDaf){ * * levels should be as long as the full length of textDepth... * @param book - * @param levels (could be segment.levels) ex. {0, 2, 3} would return headers.size() == 2, with headers.get(0) reffering to the middle level (2), and headers.get(1) would reffer to the highest level (3) + * @param levels (could be segment.levels) ex. {0, 2, 3} would return headers.size() == 2, with headers.get(0) refering to the middle level (2), and headers.get(1) would refer to the highest level (3) * @return empty list if there's a problem. And normally a list of headers for each nonZero level of levels (headers.get(0) is the lowest non zero level (ex. verse)) */ private static ArrayList
getAllSectionDepthsHeaders(Book book, int [] levels){ @@ -155,7 +155,7 @@ private static ArrayList
getAllSectionDepthsHeaders(Book book, int [] le if(levels[i] == 0) return finalHeaders; } - int numOfrequestedLevels = levels.length - nonZeroLevel; + int numOfRequestedLevels = levels.length - nonZeroLevel; String sql = "SELECT * FROM Headers WHERE bid = " + book.bid; for(int i = 0; i < levels.length; i++){ @@ -194,7 +194,7 @@ else if(headers.size()< levels.length){//find the missing ones for(int i = levels.length - 1; i>=0; i--){ if(headNum + 1 > headers.size()){ - if(headNum + 1 > numOfrequestedLevels){ + if(headNum + 1 > numOfRequestedLevels){ break; } finalHeaders.add(createHeader(book.sectionNamesL2B[i], book.heSectionNamesL2B[i], levels[i])); @@ -393,7 +393,7 @@ public static void addHeaders(Context context){ Database dbHandler = Database.getInstance(MyApp.context); SQLiteDatabase db = dbHandler.getWritableDatabase(); db.execSQL("DROP TABLE IF EXISTS " + TABLE_HEADERS); //TODO be able to update only a bit at a time. - db.execSQL(CREATE_HEADES_TABLE); + db.execSQL(CREATE_HEADES_TABLE /* headers? heads? */); Log.d("sql_headers_add", "about to add headers"); diff --git a/app/src/main/java/org/sefaria/sefaria/database/LinkFilter.java b/app/src/main/java/org/sefaria/sefaria/database/LinkFilter.java index 6c5f515..7a09b26 100755 --- a/app/src/main/java/org/sefaria/sefaria/database/LinkFilter.java +++ b/app/src/main/java/org/sefaria/sefaria/database/LinkFilter.java @@ -228,7 +228,7 @@ private static LinkFilter getCommentaryOnChap(int chapStart, int chapEnd, int bi * @param count */ private void addCommentaryCount(String title, int count, String heTitle, Book parentBook){ - if(count == 0) return; //it's not worth trying to go through the whole list testing a match, if this is just zero anyways. (It should never happen that this is 0). + if(count == 0) return; //it's not worth trying to go through the whole list testing a match, if this is just zero anyway. (It should never happen that this is 0). for(LinkFilter child: children){ if(child.enTitle.equals(title)){ child.count = count; diff --git a/app/src/main/java/org/sefaria/sefaria/database/Node.java b/app/src/main/java/org/sefaria/sefaria/database/Node.java index 9425d58..fd8ce8f 100755 --- a/app/src/main/java/org/sefaria/sefaria/database/Node.java +++ b/app/src/main/java/org/sefaria/sefaria/database/Node.java @@ -553,7 +553,7 @@ public String getPath(Util.Lang lang, boolean forURL, boolean includeBook, boole String separator; boolean addSpace = true; /* - if(forURL && node.isRef && "default".equals(node.titleKey)){ //for somethinbg like sefer HaChinach + if(forURL && node.isRef && "default".equals(node.titleKey)){ //for something like sefer HaChinuch Log.d("node", "it's default.. " + node); return } @@ -721,7 +721,7 @@ private static void addSubChaps(Node upperNode, int currDepth, JSONObject jsonOb }catch (JSONException e1){ all = jsonObject.getJSONObject("default").getJSONObject("_all");//TODO this doesn't actually fix anything // https://trello.com/c/1trTrZ1S/108-zohar-text-toc-in-parasha-view-doesn-t-show-dappim - // Sefer HaChinkh bug + // Sefer HaChinuch bug } counts = all.getJSONArray("availableTexts"); } catch (JSONException e) { @@ -955,7 +955,7 @@ private static String talmudFormatConverter(String input){ return input; } - private List getTextsFromAPI() throws API.APIException{ //(String booktitle, int []levels) + private List getTextsFromAPI() throws API.APIException{ //(String bookTitle, int []levels) String data = getTextFromAPIData(); boolean isTalmudBavli; try { diff --git a/app/src/main/java/org/sefaria/sefaria/database/SearchingDB.java b/app/src/main/java/org/sefaria/sefaria/database/SearchingDB.java index d4676d8..b44552f 100755 --- a/app/src/main/java/org/sefaria/sefaria/database/SearchingDB.java +++ b/app/src/main/java/org/sefaria/sefaria/database/SearchingDB.java @@ -104,7 +104,7 @@ private static ArrayList JHpacketToNums (byte [] bytes) { for(int i = 0;i< bytes.length/4;i++){ int a = (Integer.valueOf(bytes[i*4]) & 0xff)*BITS_PER_PACKET; //0xff should remove the negative from byte if(a < 0){ - Log.e("searching", "bad byte ocnvertion.."); + Log.e("searching", "bad byte conversion.."); } int bitNum = 0; for(int j = 3; j >=1;j--){ @@ -293,12 +293,12 @@ private static String replace_(boolean wholeWord){ private static String replacePer(boolean wholeWord){ //if(wholeWord) return "[^\\s\u05be]*";//it's not perfect, but basically it's saying as long as there's no space in between it's good - //else return ".*?"; //you might want this for not whole words... but then it basically gets eberything + //else return ".*?"; //you might want this for not whole words... but then it basically gets everything } private static Pattern nikkudlessRegEx(String word, boolean wholeWord, Util.Lang lang){ - String nikkuds = "[\u0591-\u05bd\u05bf-\u05C7\u05f3\u05f4\'\"]*";//all nukkids but - mark + String nikkuds = "[\u0591-\u05bd\u05bf-\u05C7\u05f3\u05f4\'\"]*";//all nikkuds but - mark if(lang == Util.Lang.EN){ nikkuds = ""; } @@ -353,7 +353,7 @@ public static List findWordsInList(List list, String word, boo enPattern = Pattern.compile(word.replaceAll("_", ".").replaceAll("%", ".*"),Pattern.CASE_INSENSITIVE); //make case insensitive else enPattern = Pattern.compile(word.replaceAll("_", replace_(false)).replaceAll("%", replacePer(false)),Pattern.CASE_INSENSITIVE); //make case insensitive - }catch(Exception e){//maybe try excaping the regex + }catch(Exception e){//maybe try escaping the regex enPattern = Pattern.compile(""); Toast.makeText(MyApp.getContext(), MyApp.getContext().getString(R.string.error_parsing_query), Toast.LENGTH_SHORT).show(); } @@ -693,7 +693,7 @@ private ArrayList searchDBheTexts() { do { Segment segment = new Segment(cursor); - //if(verse.length() > 4000) continue;//TODO this is a major hackk!!, but we aren't searching huge things + //if(verse.length() > 4000) continue;//TODO this is a major hack!!, but we aren't searching huge things String verse = segment.getText(Util.Lang.HE); boolean foundAllWords = true; @@ -704,7 +704,7 @@ private ArrayList searchDBheTexts() { break; } } - if(foundAllWords) { //divided into different parts so the addingHighlighting doesn't need to run each time + if(foundAllWords) { //divideed into different parts so the addingHighlighting doesn't need to run each time for (int j = 0; j < words.length; j++) { verse = segment.getText(Util.Lang.HE); Matcher m = patterns[j].matcher(verse); diff --git a/app/src/main/java/org/sefaria/sefaria/database/Segment.java b/app/src/main/java/org/sefaria/sefaria/database/Segment.java index ec337cf..44701d6 100755 --- a/app/src/main/java/org/sefaria/sefaria/database/Segment.java +++ b/app/src/main/java/org/sefaria/sefaria/database/Segment.java @@ -511,7 +511,7 @@ public void run() { } cursor.close(); Log.d("sql_textFind", "end.." + "finished!!! " + foundCount + " ..." + count); - //LOGING: + //LOGGING: //for(int i = 0; i < segmentList.size(); i++) // segmentList.get(i).log(); }catch(Exception e){ diff --git a/app/src/main/java/org/sefaria/sefaria/database/UpdateService.java b/app/src/main/java/org/sefaria/sefaria/database/UpdateService.java index de2f893..fde2585 100755 --- a/app/src/main/java/org/sefaria/sefaria/database/UpdateService.java +++ b/app/src/main/java/org/sefaria/sefaria/database/UpdateService.java @@ -49,7 +49,7 @@ public class UpdateService extends Service { public static final String DATABASE_ZIP_DOWNLOAD_LOC = Downloader.FULL_DOWNLOAD_PATH + Database.DB_NAME + ".zip"; public static final String INDEX_DOWNLOAD_LOC = Downloader.FULL_DOWNLOAD_PATH + Downloader.INDEX_JSON_NAME; - private static final String LAST_ASK_TO_UPGRADE_TIME = "LAST_ASK_TIME_UPGADE_TIME"; + private static final String LAST_ASK_TO_UPGRADE_TIME = "LAST_ASK_TIME_UPGRADE_TIME"; //these two vars are stupid, but work. they are persistent vars which I need for checking version num. before and after this, they serve no purpose public static int updatedVersionNum; diff --git a/app/src/main/java/org/sefaria/sefaria/layouts/AutoResizeTextView.java b/app/src/main/java/org/sefaria/sefaria/layouts/AutoResizeTextView.java index 3df4703..b6b13ef 100755 --- a/app/src/main/java/org/sefaria/sefaria/layouts/AutoResizeTextView.java +++ b/app/src/main/java/org/sefaria/sefaria/layouts/AutoResizeTextView.java @@ -33,7 +33,7 @@ public class AutoResizeTextView extends SefariaTextView private int _widthLimit; private int _maxLines; private boolean _enableSizeCache=true; - private boolean _initiallized=false; + private boolean _initialized=false; private TextPaint paint; private interface SizeTester @@ -105,7 +105,7 @@ public int onTestSize(final int suggestedSize,final RectF availableSPace) return 1; } }; - _initiallized=true; + _initialized=true; } @Override @@ -212,7 +212,7 @@ private void adjustTextSize() // @Override // public void run() // { - if(!_initiallized) + if(!_initialized) return; final int startSize=(int)_minTextSize; final int heightLimit=getMeasuredHeight()-getCompoundPaddingBottom()-getCompoundPaddingTop(); diff --git a/app/src/main/java/org/sefaria/sefaria/layouts/CustomActionbar.java b/app/src/main/java/org/sefaria/sefaria/layouts/CustomActionbar.java index c889379..f76824a 100755 --- a/app/src/main/java/org/sefaria/sefaria/layouts/CustomActionbar.java +++ b/app/src/main/java/org/sefaria/sefaria/layouts/CustomActionbar.java @@ -29,8 +29,8 @@ public class CustomActionbar extends MenuElement { private View menuBtn; private View menuLangBtn; private View backBtn; - private View invisableBtn; - private View invisableBtnLeft; + private View invisibleBtn; + private View invisibleBtnLeft; private LinearLayout wholeTitleLinearLayout; private SefariaTextView titleTV; private String heText = null; @@ -56,8 +56,8 @@ public CustomActionbar(Activity activity, MenuNode menuNode, Util.Lang lang, OnC menuBtn = findViewById(R.id.menu_btn); menuLangBtn = findViewById(R.id.menu_lang_btn); backBtn = findViewById(R.id.back_btn); - invisableBtn = findViewById(R.id.invisable_btn); - invisableBtnLeft = findViewById(R.id.invisable_btn_left); + invisibleBtn = findViewById(R.id.invisible_btn); + invisibleBtnLeft = findViewById(R.id.invisible_btn_left); colorBar = findViewById(R.id.color_bar); wholeTitleLinearLayout = (LinearLayout) findViewById(R.id.whole_title); titleTV = (SefariaTextView) findViewById(R.id.title); @@ -84,8 +84,8 @@ public CustomActionbar(Activity activity, MenuNode menuNode, Util.Lang lang, OnC if (homeClick != null) homeBtn.setOnClickListener(homeClick); else{ homeBtn.setVisibility(View.GONE); - invisableBtn.setVisibility(View.GONE); - invisableBtnLeft.setVisibility(View.GONE); + invisibleBtn.setVisibility(View.GONE); + invisibleBtnLeft.setVisibility(View.GONE); } if(homeLongClick != null) @@ -171,7 +171,7 @@ public void setMenuBtnLang(Util.Lang lang) { if (lang == Util.Lang.HE) { tv.setText("A"); - tv.setFont(Util.Lang.EN, true,getResources().getDimension(R.dimen.custom_action_bar_lang_font_size), TypedValue.COMPLEX_UNIT_PX);//using pixels b/c when using getDimentions it actually converts to pixels + tv.setFont(Util.Lang.EN, true,getResources().getDimension(R.dimen.custom_action_bar_lang_font_size), TypedValue.COMPLEX_UNIT_PX);//using pixels b/c when using getDimensions it actually converts to pixels } else /* if (lang == Util.Lang.EN) */ { tv.setText("א"); diff --git a/app/src/main/java/org/sefaria/sefaria/layouts/LinkDraggerView.java b/app/src/main/java/org/sefaria/sefaria/layouts/LinkDraggerView.java index 6aa5d69..76c4f3b 100644 --- a/app/src/main/java/org/sefaria/sefaria/layouts/LinkDraggerView.java +++ b/app/src/main/java/org/sefaria/sefaria/layouts/LinkDraggerView.java @@ -143,7 +143,7 @@ public boolean onInterceptTouchEvent(MotionEvent event) { case MotionEvent.ACTION_MOVE: { long clickDuration = Calendar.getInstance().getTimeInMillis() - startClickTime; if(clickDuration < MAX_CLICK_DURATION) { - return false; //click event has occured + return false; //click event has occurred } else { //drag event return true; diff --git a/app/src/main/java/org/sefaria/sefaria/layouts/PerekTextView1.java b/app/src/main/java/org/sefaria/sefaria/layouts/PerekTextView1.java index b374c11..6a4441a 100755 --- a/app/src/main/java/org/sefaria/sefaria/layouts/PerekTextView1.java +++ b/app/src/main/java/org/sefaria/sefaria/layouts/PerekTextView1.java @@ -27,7 +27,7 @@ public class PerekTextView1 extends JustifyTextView { public static final int EXTRA_LOAD_LINES = 5; - private boolean isCts; //is text continuous or seperated by passuk + private boolean isCts; //is text continuous or separated by passuk private Util.Lang lang; private int mLineY; private int mViewWidth; diff --git a/app/src/main/java/org/sefaria/sefaria/layouts/SefariaTextView.java b/app/src/main/java/org/sefaria/sefaria/layouts/SefariaTextView.java index 60b5eea..edf17c4 100755 --- a/app/src/main/java/org/sefaria/sefaria/layouts/SefariaTextView.java +++ b/app/src/main/java/org/sefaria/sefaria/layouts/SefariaTextView.java @@ -58,7 +58,7 @@ public SefariaTextView(Context context, AttributeSet attributeSet) { if(lang == Util.Lang.HE) { //don't do italics when it's Hebrew b/c it's weird. - // Honestly this b/c of william D Talmud and if there's something else that needs it we can chaneg this + // Honestly this b/c of william D Talmud and if there's something else that needs it we can change this style = null; } setFont(lang, isSerif, -1, TypedValue.COMPLEX_UNIT_SP, style); diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index af564b0..79a679b 100755 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -282,7 +282,7 @@ android:gravity="center" android:padding="1dp" android:textColor="?text_color_soft" - android:onClick="debubDBUnlockClick" + android:onClick="debugDBUnlockClick" android:clickable="true"/> diff --git a/app/src/main/res/layout/adapter_text_bilingual_side_by_side.xml b/app/src/main/res/layout/adapter_text_bilingual_side_by_side.xml index 47846f3..dec08ac 100644 --- a/app/src/main/res/layout/adapter_text_bilingual_side_by_side.xml +++ b/app/src/main/res/layout/adapter_text_bilingual_side_by_side.xml @@ -15,7 +15,7 @@ android:layout_alignTop="@+id/side_by_side_layout" android:paddingRight="0dp" android:paddingLeft="0dp" - android:paddingTop="@dimen/text_activtiy_numbering_padding" + android:paddingTop="@dimen/text_activity_numbering_padding" android:gravity="center" android:textSize="12sp" android:text="26"/> @@ -26,10 +26,10 @@ android:orientation="horizontal"> diff --git a/app/src/main/res/layout/adapter_text_bilingual_top_bottom.xml b/app/src/main/res/layout/adapter_text_bilingual_top_bottom.xml index 66dabad..9542f18 100755 --- a/app/src/main/res/layout/adapter_text_bilingual_top_bottom.xml +++ b/app/src/main/res/layout/adapter_text_bilingual_top_bottom.xml @@ -15,7 +15,7 @@ android:layout_alignTop="@+id/top_bottom_layout" android:paddingRight="0dp" android:paddingLeft="0dp" - android:paddingTop="@dimen/text_activtiy_numbering_padding" + android:paddingTop="@dimen/text_activity_numbering_padding" android:gravity="center" android:textSize="12sp" android:text="26"/> @@ -26,10 +26,10 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/adapter_text_mono.xml b/app/src/main/res/layout/adapter_text_mono.xml index 3a99b76..86a7ece 100755 --- a/app/src/main/res/layout/adapter_text_mono.xml +++ b/app/src/main/res/layout/adapter_text_mono.xml @@ -13,7 +13,7 @@ android:layout_height="wrap_content" android:layout_alignTop="@+id/mono" android:layout_alignParentLeft="true" - android:paddingTop="@dimen/text_activtiy_numbering_padding" + android:paddingTop="@dimen/text_activity_numbering_padding" android:paddingLeft="0dp" android:gravity="center" android:textSize="12sp" @@ -22,8 +22,8 @@ android:id="@+id/mono" android:paddingRight="10dp" android:paddingLeft="10dp" - android:paddingTop="@dimen/text_activtiy_between_segment_padding" - android:paddingBottom="@dimen/text_activtiy_between_segment_padding" + android:paddingTop="@dimen/text_activity_between_segment_padding" + android:paddingBottom="@dimen/text_activity_between_segment_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignLeft="@+id/enVerseNum" @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_alignTop="@+id/mono" - android:paddingTop="@dimen/text_activtiy_numbering_padding" + android:paddingTop="@dimen/text_activity_numbering_padding" android:paddingRight="0dp" android:textSize="12sp" android:gravity="center" diff --git a/app/src/main/res/layout/book_version_info.xml b/app/src/main/res/layout/book_version_info.xml index 95f4445..dd6b15f 100755 --- a/app/src/main/res/layout/book_version_info.xml +++ b/app/src/main/res/layout/book_version_info.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - diff --git a/app/src/main/res/layout/link_category.xml b/app/src/main/res/layout/link_category.xml index 527d2f0..ee5c0fe 100755 --- a/app/src/main/res/layout/link_category.xml +++ b/app/src/main/res/layout/link_category.xml @@ -15,7 +15,7 @@ android:layout_height="@dimen/color_bar_height" android:layout_marginLeft="2dp" android:layout_marginRight="2dp" - android:background="@color/halkhah"/> + android:background="@color/halakhah"/> גרסת הספריה:\u0020 אין חיבור לרשת דרוש חיבור לרשת בכדי להוריד את העדכון. אנא נסה שוב מאוחר יותר - ארעה שגיאה בכתיבה לקובץ. אנא בדוק את ההרשאות של האפליקציה + ארעה שגיאה בכתיבה לקובץ. אנא בדוק את ההרשאות של האפליקציה Error Parsing Query - trying nikudah dependent search. ארעה שגיאה בביצוע השאילתה שדרג לגרסה העדכנית ביותר של diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 17fa0f1..39dacbe 100755 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -5,7 +5,7 @@ #5a99b7 #ccb479 #5d956f - #802f3e + #802f3e #594176 #ab4e66 #7f85a9 @@ -24,7 +24,7 @@ #F9F9F7 #dddddd - #c1c1c1 + #c1c1c1 #9B9B9B #9B9B9B @@ -51,7 +51,7 @@ #142b51 - + #fff #bbb diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index a643d59..4376c77 100755 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -34,8 +34,8 @@ 5dp - 6dp - 10dp + 6dp + 10dp 30dp 16dp -20dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 49bb2b0..eec590d 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -47,7 +47,7 @@ Library Version:\u0020 No Internet You need internet in order to download the update. Try again later. - There was a problem writing file. Please check app permissions. + There was a problem writing file. Please check app permissions. Error Parsing Query - trying nikudah dependent search. Error Parsing Query Upgrade to the newest version of @@ -60,7 +60,7 @@ Do you want to download the new Sefaria library now?\nYou can always tap \'Update Library\' in settings to update. Are you sure you want to cancel? Your update would need to be restarted - You are using mobile data (not WIFI). The library is about 200MB. Do you want to download it anyways? + You are using mobile data (not Wi-Fi). The library is about 200MB. Do you want to download it anyway? Using mobile data Requires ~250MB of storage on your device diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index e61c429..218dce7 100755 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -12,7 +12,7 @@ @drawable/splash_background_drawable diff --git a/build.gradle b/build.gradle index 92e9c90..a139c28 100755 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { classpath 'com.google.gms:google-services:2.0.0-alpha6' // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + // in the individeual module build.gradle files } } diff --git a/originalGraphics/Cardo/OFL.txt b/originalGraphics/Cardo/OFL.txt index bd6b117..74a3109 100755 --- a/originalGraphics/Cardo/OFL.txt +++ b/originalGraphics/Cardo/OFL.txt @@ -49,7 +49,7 @@ a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: -1) Neither the Font Software nor any of its individual components, +1) Neither the Font Software nor any of its individeual components, in Original or Modified Versions, may be sold by itself. 2) Original or Modified Versions of the Font Software may be bundled,