From 960b66d76113873eb4e978bb53966f2320dcfb13 Mon Sep 17 00:00:00 2001 From: opyale Date: Sun, 12 Apr 2020 11:25:09 +0200 Subject: [PATCH] Manrope just literally as default font. --- .../mian/gitnex/activities/BaseActivity.java | 58 +++++++------------ .../mian/gitnex/activities/MainActivity.java | 25 ++++---- .../OrganizationDetailActivity.java | 24 ++++---- .../gitnex/activities/RepoDetailActivity.java | 24 ++++---- .../adapters/RepoStargazersAdapter.java | 25 ++++---- .../gitnex/adapters/RepoWatchersAdapter.java | 25 ++++---- .../adapters/TeamMembersByOrgAdapter.java | 26 ++++----- .../gitnex/fragments/ProfileFragment.java | 24 ++++---- 8 files changed, 92 insertions(+), 139 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java index 960e9e5e..fad60f21 100644 --- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java @@ -27,51 +27,35 @@ public abstract class BaseActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(getLayoutResourceId()); - if(tinyDb.getInt("customFontId") == 0) { + switch(tinyDb.getInt("customFontId")) { - FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/roboto.ttf"); - FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/roboto.ttf"); - FontsOverride.setDefaultFont(this, "SERIF", "fonts/roboto.ttf"); - FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/roboto.ttf"); + case 0: + FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/roboto.ttf"); + FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/roboto.ttf"); + FontsOverride.setDefaultFont(this, "SERIF", "fonts/roboto.ttf"); + FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/roboto.ttf"); + break; - } - else if(tinyDb.getInt("customFontId") == 1) { + case 2: + FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/sourcecodeproregular.ttf"); + FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/sourcecodeproregular.ttf"); + FontsOverride.setDefaultFont(this, "SERIF", "fonts/sourcecodeproregular.ttf"); + FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/sourcecodeproregular.ttf"); + break; - FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/manroperegular.ttf"); - FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/manroperegular.ttf"); - FontsOverride.setDefaultFont(this, "SERIF", "fonts/manroperegular.ttf"); - FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/manroperegular.ttf"); - - } - else if(tinyDb.getInt("customFontId") == 2) { - - FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/sourcecodeproregular.ttf"); - FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/sourcecodeproregular.ttf"); - FontsOverride.setDefaultFont(this, "SERIF", "fonts/sourcecodeproregular.ttf"); - FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/sourcecodeproregular.ttf"); - - } - else { - - FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/roboto.ttf"); - FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/roboto.ttf"); - FontsOverride.setDefaultFont(this, "SERIF", "fonts/roboto.ttf"); - FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/roboto.ttf"); + default: + FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/manroperegular.ttf"); + FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/manroperegular.ttf"); + FontsOverride.setDefaultFont(this, "SERIF", "fonts/manroperegular.ttf"); + FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/manroperegular.ttf"); + break; } // enabling counter badges by default - if(!tinyDb.getBoolean("enableCounterBadgesInit")) { + if(tinyDb.getString("enableCounterBadgesInit").isEmpty()) { tinyDb.putBoolean("enableCounterBadges", true); - tinyDb.putBoolean("enableCounterBadgesInit", true); - } - - // setting default font - if(!tinyDb.getBoolean("customFontStrInit")) { - tinyDb.putString("customFontStr", "Manrope"); - tinyDb.putInt("customFontId", 1); - - tinyDb.putBoolean("customFontStrInit", true); + tinyDb.putString("enableCounterBadgesInit", "yes"); } } diff --git a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java index 7156d378..992ee6bf 100644 --- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java @@ -109,24 +109,19 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig Toolbar toolbar = findViewById(R.id.toolbar); toolbarTitle = toolbar.findViewById(R.id.toolbar_title); - if(tinyDb.getInt("customFontId") == 0) { + switch(tinyDb.getInt("customFontId")) { - myTypeface = Typeface.createFromAsset(getAssets(), "fonts/roboto.ttf"); + case 0: + myTypeface = Typeface.createFromAsset(getAssets(), "fonts/roboto.ttf"); + break; - } - else if (tinyDb.getInt("customFontId") == 1) { + case 2: + myTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodeproregular.ttf"); + break; - myTypeface = Typeface.createFromAsset(getAssets(), "fonts/manroperegular.ttf"); - - } - else if (tinyDb.getInt("customFontId") == 2) { - - myTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodeproregular.ttf"); - - } - else { - - myTypeface = Typeface.createFromAsset(getAssets(), "fonts/roboto.ttf"); + default: + myTypeface = Typeface.createFromAsset(getAssets(), "fonts/manroperegular.ttf"); + break; } diff --git a/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java index b41468e9..1269c327 100644 --- a/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java @@ -58,24 +58,20 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh TabLayout tabLayout = findViewById(R.id.tabs); Typeface myTypeface; - if(tinyDb.getInt("customFontId") == 0) { - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf"); + switch(tinyDb.getInt("customFontId")) { - } - else if (tinyDb.getInt("customFontId") == 1) { + case 0: + myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/roboto.ttf"); + break; - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf"); + case 2: + myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/sourcecodeproregular.ttf"); + break; - } - else if (tinyDb.getInt("customFontId") == 2) { - - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/sourcecodeproregular.ttf"); - - } - else { - - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf"); + default: + myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/manroperegular.ttf"); + break; } diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java index 29033221..a8515e3e 100644 --- a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java @@ -92,24 +92,20 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF TabLayout tabLayout = findViewById(R.id.tabs); Typeface myTypeface; - if(tinyDb.getInt("customFontId") == 0) { - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf"); + switch(tinyDb.getInt("customFontId")) { - } - else if (tinyDb.getInt("customFontId") == 1) { + case 0: + myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/roboto.ttf"); + break; - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf"); + case 2: + myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/sourcecodeproregular.ttf"); + break; - } - else if (tinyDb.getInt("customFontId") == 2) { - - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/sourcecodeproregular.ttf"); - - } - else { - - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf"); + default: + myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/manroperegular.ttf"); + break; } diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java index 9b4d6e72..a7037b49 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java @@ -84,24 +84,19 @@ public class RepoStargazersAdapter extends BaseAdapter { final TinyDB tinyDb = new TinyDB(mCtx); Typeface myTypeface; - if(tinyDb.getInt("customFontId") == 0) { + switch(tinyDb.getInt("customFontId")) { - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + case 0: + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + break; - } - else if (tinyDb.getInt("customFontId") == 1) { + case 2: + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf"); + break; - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf"); - - } - else if (tinyDb.getInt("customFontId") == 2) { - - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf"); - - } - else { - - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + default: + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf"); + break; } diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java index 0e46e049..032e1112 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java @@ -84,24 +84,19 @@ public class RepoWatchersAdapter extends BaseAdapter { final TinyDB tinyDb = new TinyDB(mCtx); Typeface myTypeface; - if(tinyDb.getInt("customFontId") == 0) { + switch(tinyDb.getInt("customFontId")) { - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + case 0: + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + break; - } - else if (tinyDb.getInt("customFontId") == 1) { + case 2: + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf"); + break; - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf"); - - } - else if (tinyDb.getInt("customFontId") == 2) { - - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf"); - - } - else { - - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + default: + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf"); + break; } diff --git a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java index 7e356bff..1793a347 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java @@ -11,6 +11,7 @@ import android.widget.ImageView; import android.widget.TextView; import org.mian.gitnex.R; import org.mian.gitnex.clients.PicassoService; +import org.mian.gitnex.helpers.FontsOverride; import org.mian.gitnex.helpers.RoundedTransformation; import org.mian.gitnex.models.UserInfo; import org.mian.gitnex.util.TinyDB; @@ -85,24 +86,19 @@ public class TeamMembersByOrgAdapter extends BaseAdapter { final TinyDB tinyDb = new TinyDB(mCtx); Typeface myTypeface; - if(tinyDb.getInt("customFontId") == 0) { + switch(tinyDb.getInt("customFontId")) { - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + case 0: + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + break; - } - else if (tinyDb.getInt("customFontId") == 1) { + case 2: + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf"); + break; - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf"); - - } - else if (tinyDb.getInt("customFontId") == 2) { - - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf"); - - } - else { - - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + default: + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf"); + break; } diff --git a/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java b/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java index f8907a8e..1e3dedfa 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java @@ -58,24 +58,20 @@ public class ProfileFragment extends Fragment { mViewPager.setAdapter(mSectionsPagerAdapter); Typeface myTypeface; - if(tinyDb.getInt("customFontId") == 0) { - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf"); + switch(tinyDb.getInt("customFontId")) { - } - else if (tinyDb.getInt("customFontId") == 1) { + case 0: + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf"); + break; - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/manroperegular.ttf"); + case 2: + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/sourcecodeproregular.ttf"); + break; - } - else if (tinyDb.getInt("customFontId") == 2) { - - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/sourcecodeproregular.ttf"); - - } - else { - - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf"); + default: + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/manroperegular.ttf"); + break; }