gitnex/GitNex
gitnex/GitNex
Archived
14
57
Fork 14
Code Issues Pull Requests 2 Releases 22 Wiki Activity

Theme and Icons #260

Merged
mmarif merged 15 commits from light-theme into master 2020-03-08 13:52:34 +00:00
Conversation 9 Commits 15 Files Changed 214 +101 -66
22 changed files with 101 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit acdb9ce682 - Show all commits

2
app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
View File

@ -15,7 +15,7 @@ public abstract class BaseActivity extends AppCompatActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
setTheme(R.style.AppThemeLight);
setTheme(R.style.AppTheme);
super.onCreate(savedInstanceState);
6543 commented 2020-03-06 18:48:52 +00:00
Outdated
Review
Copy Link

can you test for == 1 and else set default theme?

can you test for == 1 and else set default theme?
mmarif commented 2020-03-06 20:04:12 +00:00
Outdated
Review
Copy Link

Yes, that will work too.

Yes, that will work too.
setContentView(getLayoutResourceId());

15
app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
View File

@ -2,7 +2,6 @@ package org.mian.gitnex.activities;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import retrofit2.Call;
import retrofit2.Callback;
import android.content.Context;
@ -30,7 +29,7 @@ import android.util.Log;
* Author M M Arif
*/
public class CreateTeamByOrgActivity extends AppCompatActivity implements View.OnClickListener {
public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClickListener {
final Context ctx = CreateTeamByOrgActivity.this;
private View.OnClickListener onClickListener;
@ -44,6 +43,11 @@ public class CreateTeamByOrgActivity extends AppCompatActivity implements View.O
private String[] permissionList = {"Read", "Write", "Admin"};
public int permissionSelectedChoice = -1;
@Override
protected int getLayoutResourceId(){
return R.layout.activity_create_team_by_org;
}
private String[] accessControlsList = new String[] {
"Code",
"Issues",
@ -67,9 +71,8 @@ public class CreateTeamByOrgActivity extends AppCompatActivity implements View.O
};
@Override
protected void onCreate(Bundle savedInstanceState) {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_create_team_by_org);
boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
@ -89,7 +92,7 @@ public class CreateTeamByOrgActivity extends AppCompatActivity implements View.O
@Override
public void onClick(View view) {
AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx);
pBuilder.setTitle(R.string.newTeamPermission);
if(permissionSelectedChoice != -1) {
@ -141,7 +144,7 @@ public class CreateTeamByOrgActivity extends AppCompatActivity implements View.O
teamAccessControlsArray.setText("");
pushAccessList = Arrays.asList(accessControlsList);
AlertDialog.Builder aDialogBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
AlertDialog.Builder aDialogBuilder = new AlertDialog.Builder(ctx);
aDialogBuilder.setMultiChoiceItems(accessControlsList, selectedAccessControlsTrueFalse, new DialogInterface.OnMultiChoiceClickListener() {

11
app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java
View File

@ -1,6 +1,5 @@
package org.mian.gitnex.activities;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@ -18,15 +17,19 @@ import java.util.List;
* Author M M Arif
*/
public class CreditsActivity extends AppCompatActivity {
public class CreditsActivity extends BaseActivity {
private View.OnClickListener onClickListener;
@Override
protected void onCreate(Bundle savedInstanceState) {
protected int getLayoutResourceId(){
return R.layout.activity_credits;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_credits);
ImageView closeActivity = findViewById(R.id.close);

2
app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
View File

@ -403,7 +403,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
return;
case UNSUPPORTED_OLD:
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx);
alertDialogBuilder
.setTitle(getString(R.string.versionAlertDialogHeader))

11
app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java
View File

@ -1,6 +1,5 @@
package org.mian.gitnex.activities;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@ -18,14 +17,18 @@ import java.util.List;
* Author M M Arif
*/
public class SponsorsActivity extends AppCompatActivity {
public class SponsorsActivity extends BaseActivity {
private View.OnClickListener onClickListener;
@Override
protected void onCreate(Bundle savedInstanceState) {
protected int getLayoutResourceId(){
return R.layout.activity_sponsors;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_sponsors);
ImageView closeActivity = findViewById(R.id.close);

4
app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
View File

@ -90,9 +90,9 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
public void onClick(View v) {
final Context context = v.getContext();
Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
//Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
PopupMenu popupMenu = new PopupMenu(context_, v);
PopupMenu popupMenu = new PopupMenu(context, v);
popupMenu.inflate(R.menu.repo_dotted_list_menu);
Object menuHelper;

4
app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
View File

@ -90,9 +90,9 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
public void onClick(View v) {
final Context context = v.getContext();
Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
//Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
PopupMenu popupMenu = new PopupMenu(context_, v);
PopupMenu popupMenu = new PopupMenu(context, v);
popupMenu.inflate(R.menu.issue_comment_menu);
Object menuHelper;

4
app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
View File

@ -56,9 +56,9 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
public void onClick(View v) {
final Context context = v.getContext();
Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
//Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
PopupMenu popupMenu = new PopupMenu(context_, v);
PopupMenu popupMenu = new PopupMenu(context, v);
popupMenu.inflate(R.menu.labels_menu);
Object menuHelper;

4
app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
View File

@ -88,9 +88,9 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
public void onClick(View v) {
final Context context = v.getContext();
Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
//Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
PopupMenu popupMenu = new PopupMenu(context_, v);
PopupMenu popupMenu = new PopupMenu(context, v);
popupMenu.inflate(R.menu.repo_dotted_list_menu);
Object menuHelper;

4
app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
View File

@ -91,9 +91,9 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
public void onClick(View v) {
final Context context = v.getContext();
Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
//Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
PopupMenu popupMenu = new PopupMenu(context_, v);
PopupMenu popupMenu = new PopupMenu(context, v);
popupMenu.inflate(R.menu.repo_dotted_list_menu);
Object menuHelper;

4
app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
View File

@ -88,9 +88,9 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
public void onClick(View v) {
final Context context = v.getContext();
Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
//Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
PopupMenu popupMenu = new PopupMenu(context_, v);
PopupMenu popupMenu = new PopupMenu(context, v);
popupMenu.inflate(R.menu.repo_dotted_list_menu);
Object menuHelper;

4
app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
View File

@ -88,9 +88,9 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
public void onClick(View v) {
final Context context = v.getContext();
Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
Context context_ = new ContextThemeWrapper(context, R.style.AppThemeConfirmDialog);
PopupMenu popupMenu = new PopupMenu(context_, v);
PopupMenu popupMenu = new PopupMenu(context, v);
popupMenu.inflate(R.menu.repo_dotted_list_menu);
Object menuHelper;

2
app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
View File

@ -68,7 +68,7 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
final Context context = v.getContext();
AlertDialog.Builder pBuilder = new AlertDialog.Builder(context, R.style.confirmDialog);
AlertDialog.Builder pBuilder = new AlertDialog.Builder(context);
pBuilder.setTitle(R.string.newTeamPermission);
pBuilder.setSingleChoiceItems(permissionList, permissionSelectedChoice, new DialogInterface.OnClickListener() {

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

@ -140,7 +140,7 @@ public class SettingsFragment extends Fragment {
@Override
public void onClick(View view) {
AlertDialog.Builder cfBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
AlertDialog.Builder cfBuilder = new AlertDialog.Builder(ctx, R.style.AppThemeLightConfirmDialog);
cfBuilder.setTitle(R.string.settingsCustomFontSelectorDialogTitle);
if(customFontSelectedChoice != -1) {
@ -178,7 +178,7 @@ public class SettingsFragment extends Fragment {
@Override
public void onClick(View view) {
AlertDialog.Builder hsBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
AlertDialog.Builder hsBuilder = new AlertDialog.Builder(ctx);
hsBuilder.setTitle(R.string.settingshomeScreenSelectorDialogTitle);
if(homeScreenSelectedChoice != -1) {
@ -214,7 +214,7 @@ public class SettingsFragment extends Fragment {
@Override
public void onClick(View view) {
AlertDialog.Builder cBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
AlertDialog.Builder cBuilder = new AlertDialog.Builder(ctx);
cBuilder.setTitle(R.string.settingsCodeBlockSelectorDialogTitle);
if(codeBlockSelectedChoice != -1) {
@ -273,7 +273,7 @@ public class SettingsFragment extends Fragment {
@Override
public void onClick(View view) {
AlertDialog.Builder lBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
AlertDialog.Builder lBuilder = new AlertDialog.Builder(ctx);
lBuilder.setTitle(R.string.settingsLanguageSelectorDialogTitle);
if(langSelectedChoice != -1) {
@ -359,7 +359,7 @@ public class SettingsFragment extends Fragment {
@Override
public void onClick(View view) {
AlertDialog.Builder tBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
AlertDialog.Builder tBuilder = new AlertDialog.Builder(ctx);
tBuilder.setTitle(R.string.settingsTimeSelectorDialogTitle);
if(timeSelectedChoice != -1) {

6
app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
View File

@ -18,7 +18,7 @@ public class AlertDialogs {
public static void authorizationTokenRevokedDialog(final Context context, String title, String message, String copyNegativeButton, String copyPositiveButton) {
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context, R.style.confirmDialog);
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context);
alertDialogBuilder
.setTitle(title)
@ -52,7 +52,7 @@ public class AlertDialogs {
public static void labelDeleteDialog(final Context context, final String labelTitle, final String labelId, String title, String message, String positiveButton, String negativeButton) {
new AlertDialog.Builder(context, R.style.confirmDialog)
new AlertDialog.Builder(context)
.setTitle(title + labelTitle)
.setMessage(message)
.setIcon(R.drawable.ic_delete)
@ -71,7 +71,7 @@ public class AlertDialogs {
public static void collaboratorRemoveDialog(final Context context, final String userNameMain, String title, String message, String positiveButton, String negativeButton, final String searchKeyword) {
new AlertDialog.Builder(context, R.style.confirmDialog)
new AlertDialog.Builder(context)
.setTitle(title + userNameMain)
.setMessage(message)
.setIcon(R.drawable.ic_warning)

8
app/src/main/res/layout/activity_credits.xml
View File

@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
xmlns:android="http://schemas.android.com/apk/res/android"
android:background="@color/colorPrimary">
android:background="?attr/primaryBackgroundColor">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
@ -15,7 +15,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:background="?attr/primaryBackgroundColor"
tools:ignore="UnusedAttribute">
<ImageView
@ -34,7 +34,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/pageTitleCredits"
android:textColor="@color/white"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
@ -52,7 +52,7 @@
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPrimary"
android:background="?attr/primaryBackgroundColor"
android:padding="4dp"
android:scrollbars="vertical" />

8
app/src/main/res/layout/activity_sponsors.xml
View File

@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
xmlns:android="http://schemas.android.com/apk/res/android"
android:background="@color/colorPrimary">
android:background="?attr/primaryBackgroundColor">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
@ -15,7 +15,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:background="?attr/primaryBackgroundColor"
tools:ignore="UnusedAttribute">
<ImageView
@ -34,7 +34,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/pageTitleSponsors"
android:textColor="@color/white"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
@ -52,7 +52,7 @@
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPrimary"
android:background="?attr/primaryBackgroundColor"
android:padding="4dp"
android:scrollbars="vertical" />

4
app/src/main/res/layout/credits.xml
View File

@ -7,14 +7,14 @@
android:paddingTop="10dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:background="@color/backgroundColor" >
android:background="?attr/primaryBackgroundColor" >
<TextView
android:id="@+id/creditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:textColor="@color/white"
android:textColor="?attr/primaryTextColor"
android:textColorLink="@color/lightBlue"
android:textSize="16sp" />

4
app/src/main/res/layout/sponsors.xml
View File

@ -7,14 +7,14 @@
android:paddingTop="10dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:background="@color/backgroundColor" >
android:background="?attr/primaryBackgroundColor" >
<TextView
android:id="@+id/sponsorText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:textColor="@color/white"
android:textColor="?attr/primaryTextColor"
android:textColorLink="@color/lightBlue"
android:textSize="16sp" />

1
app/src/main/res/values/attrs.xml
View File

@ -5,4 +5,5 @@
<attr name="inputBackgroundColor" format="reference" />
<attr name="inputTextColor" format="reference" />
<attr name="selectedTextColor" format="reference" />
<attr name="alertDialogTheme" format="reference" />
</resources>

15
app/src/main/res/values/styles.xml
View File

@ -19,22 +19,7 @@
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="popupMenuStyle">
<item name="android:itemBackground">@color/colorPrimary</item>
<item name="android:background">@android:color/transparent</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:colorBackground">@color/colorPrimary</item>
<item name="android:layout_marginStart">3dp</item>
<item name="android:layout_marginEnd">3dp</item>
</style>
<style name="confirmDialog" parent="Theme.AppCompat.Dialog.Alert">
<item name="android:background">@color/colorPrimary</item>
<item name="android:textColorPrimary">@android:color/white</item>
<item name="android:textColor">@android:color/white</item>
<item name="colorControlNormal">@color/white</item>
<item name="colorControlActivated">@color/white</item>
</style>
<style name="customTabLayout" parent="TextAppearance.Design.Tab">
<item name="android:textSize">16sp</item>

40
app/src/main/res/values/themes.xml
View File

@ -6,6 +6,7 @@
<item name="android:statusBarColor">@color/colorPrimary</item>
<item name="android:windowBackground">@color/colorPrimary</item>
<item name="android:typeface">monospace</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="primaryTextColor">@color/colorWhite</item>
<item name="primaryBackgroundColor">@color/colorPrimary</item>
@ -13,6 +14,8 @@
<item name="inputTextColor">@color/colorWhite</item>
<item name="checkboxStyle">@style/AppThemeCheckBoxStyle</item>
<item name="selectedTextColor">@color/darkGreen</item>
<item name="dialogTheme">@style/AppThemeConfirmDialog</item>
<item name="popupMenuStyle">@style/AppThemePopupMenuStyle</item>
</style>
<!-- Light theme -->
@ -20,6 +23,7 @@
<item name="android:statusBarColor">@color/colorPrimary</item>
<item name="android:windowBackground">@color/lightThemeBackground</item>
<item name="android:typeface">monospace</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="primaryTextColor">@color/lightThemeTextColor</item>
<item name="primaryBackgroundColor">@color/lightThemeBackground</item>
@ -27,6 +31,42 @@
<item name="inputTextColor">@color/lightThemeInputTextColor</item>
<item name="checkboxStyle">@style/AppThemeLightCheckBoxStyle</item>
<item name="selectedTextColor">@color/darkGreen</item>
<item name="dialogTheme">@style/AppThemeLightConfirmDialog</item>
<item name="popupMenuStyle">@style/AppThemePopupMenuStyle</item>
</style>
<style name="AppThemeConfirmDialog" parent="Theme.AppCompat.Dialog.Alert">
<item name="android:background">@color/colorPrimary</item>
<item name="android:textColorPrimary">@android:color/white</item>
<item name="android:textColor">@android:color/white</item>
<item name="colorControlNormal">@color/white</item>
<item name="colorControlActivated">@color/white</item>
</style>
<style name="AppThemeLightConfirmDialog" parent="Theme.AppCompat.Dialog.Alert">
<item name="android:background">@color/colorPrimary</item>
<item name="android:textColorPrimary">@color/colorPrimary</item>
<item name="android:textColor">@color/lightThemeTextColor</item>
<item name="colorControlNormal">@color/lightThemeTextColor</item>
<item name="colorControlActivated">@color/lightThemeTextColor</item>
</style>
<style name="AppThemePopupMenuStyle">
<item name="android:itemBackground">@color/colorPrimary</item>
<item name="android:background">@android:color/transparent</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:colorBackground">@color/colorPrimary</item>
<item name="android:layout_marginStart">3dp</item>
<item name="android:layout_marginEnd">3dp</item>
</style>
<style name="AppThemeLightPopupMenuStyle">
<item name="android:itemBackground">@color/lightThemeBackground</item>
<item name="android:background">@android:color/transparent</item>
<item name="android:textColor">@color/lightThemeTextColor</item>
<item name="android:colorBackground">@color/lightThemeBackground</item>
<item name="android:layout_marginStart">3dp</item>
<item name="android:layout_marginEnd">3dp</item>
</style>
<style name="AppThemeLightCheckBoxStyle" parent="Base.Widget.AppCompat.CompoundButton.CheckBox">