shihaam/GitNex
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes layout issue with themes, added pdf night mode switch in settings

Browse Source
This commit is contained in:
M M Arif
2020-03-06 18:46:22 +05:00
parent 14addf5ed0
commit 61f953d70d
17 changed files with 155 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
View File

@@ -50,6 +50,7 @@ public class FileViewActivity extends BaseActivity {
private PDFView pdfView;
private LinearLayout pdfViewFrame;
private byte[] decodedPdf;
private Boolean $nightMode;
@Override
protected int getLayoutResourceId(){
@@ -111,6 +112,8 @@ public class FileViewActivity extends BaseActivity {
private void getSingleFileContents(String instanceUrl, String token, final String owner, String repo, final String filename) {
final TinyDB tinyDb = new TinyDB(getApplicationContext());
Call<Files> call = RetrofitClient
.getInstance(instanceUrl, getApplicationContext())
.getApiInterface()
@@ -162,6 +165,8 @@ public class FileViewActivity extends BaseActivity {
singleCodeContents.setVisibility(View.GONE);
pdfViewFrame.setVisibility(View.VISIBLE);
$nightMode = tinyDb.getBoolean("enablePdfMode");
decodedPdf = Base64.decode(response.body().getContent(), Base64.DEFAULT);
pdfView.fromBytes(decodedPdf)
.enableSwipe(true)
@@ -178,7 +183,7 @@ public class FileViewActivity extends BaseActivity {
.fitEachPage(true)
.pageSnap(false)
.pageFling(true)
.nightMode(false)
.nightMode($nightMode)
.load();
}

11
app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
View File

@@ -83,6 +83,7 @@ public class RepoStargazersAdapter extends BaseAdapter {
final TinyDB tinyDb = new TinyDB(mCtx);
Typeface myTypeface;
if(tinyDb.getInt("customFontId") == 0) {
myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
@@ -113,6 +114,16 @@ public class RepoStargazersAdapter extends BaseAdapter {
viewHolder.memberName.setTypeface(myTypeface);
}
if(tinyDb.getInt("themeId") == 0) { // dark
viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
}
else if(tinyDb.getInt("themeId") == 1) { //light
viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
}
else {
viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
}
}
}

11
app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
View File

@@ -83,6 +83,7 @@ public class RepoWatchersAdapter extends BaseAdapter {
final TinyDB tinyDb = new TinyDB(mCtx);
Typeface myTypeface;
if(tinyDb.getInt("customFontId") == 0) {
myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
@@ -113,6 +114,16 @@ public class RepoWatchersAdapter extends BaseAdapter {
viewHolder.memberName.setTypeface(myTypeface);
}
if(tinyDb.getInt("themeId") == 0) { // dark
viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
}
else if(tinyDb.getInt("themeId") == 1) { //light
viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
}
else {
viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
}
}
}

15
app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
View File

@@ -25,7 +25,7 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
private List<UserInfo> teamMembersList;
private Context mCtx;
private class ViewHolder {
private static class ViewHolder {
private ImageView memberAvatar;
private TextView memberName;
@@ -65,7 +65,7 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
if (finalView == null) {
finalView = LayoutInflater.from(mCtx).inflate(R.layout.members_by_team_by_org_list, null);
viewHolder = new TeamMembersByOrgAdapter.ViewHolder(finalView);
viewHolder = new ViewHolder(finalView);
finalView.setTag(viewHolder);
}
else {
@@ -84,6 +84,7 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
final TinyDB tinyDb = new TinyDB(mCtx);
Typeface myTypeface;
if(tinyDb.getInt("customFontId") == 0) {
myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
@@ -114,5 +115,15 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
viewHolder.memberName.setTypeface(myTypeface);
}
if(tinyDb.getInt("themeId") == 0) { // dark
viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
}
else if(tinyDb.getInt("themeId") == 1) { //light
viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
}
else {
viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
}
}
}

26
app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
View File

@@ -69,6 +69,7 @@ public class SettingsFragment extends Fragment {
LinearLayout themeFrame = v.findViewById(R.id.themeSelectionFrame);
Switch issuesSwitch = v.findViewById(R.id.switchIssuesBadge);
Switch pdfModeSwitch = v.findViewById(R.id.switchPdfMode);
TextView helpTranslate = v.findViewById(R.id.helpTranslate);
helpTranslate.setOnClickListener(new View.OnClickListener() {
@@ -132,6 +133,16 @@ public class SettingsFragment extends Fragment {
if(tinyDb.getBoolean("enableCounterIssueBadge")) {
issuesSwitch.setChecked(true);
}
else {
issuesSwitch.setChecked(false);
}
if(tinyDb.getBoolean("enablePdfMode")) {
pdfModeSwitch.setChecked(true);
}
else {
pdfModeSwitch.setChecked(false);
}
// issues badge switcher
issuesSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@@ -148,6 +159,21 @@ public class SettingsFragment extends Fragment {
}
});
// pdf night mode switcher
pdfModeSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (isChecked) {
tinyDb.putBoolean("enablePdfMode", true);
tinyDb.putString("enablePdfModeInit", "yes");
Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
} else {
tinyDb.putBoolean("enablePdfMode", false);
tinyDb.putString("enablePdfModeInit", "yes");
Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
}
}
});
// theme selection dialog
themeFrame.setOnClickListener(new View.OnClickListener() {
@Override