diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 14807429..1ec4a7c9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -54,10 +54,6 @@ android:name=".activities.CreateNewUserActivity" android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" android:windowSoftInputMode="adjustResize"/> - diff --git a/app/src/main/java/org/mian/gitnex/activities/AccountSettingsEmailActivity.java b/app/src/main/java/org/mian/gitnex/activities/AccountSettingsEmailActivity.java deleted file mode 100644 index edc2aea6..00000000 --- a/app/src/main/java/org/mian/gitnex/activities/AccountSettingsEmailActivity.java +++ /dev/null @@ -1,134 +0,0 @@ -package org.mian.gitnex.activities; - -import android.os.Bundle; -import android.os.Handler; -import android.util.Patterns; -import androidx.annotation.NonNull; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import org.gitnex.tea4j.v2.models.CreateEmailOption; -import org.gitnex.tea4j.v2.models.Email; -import org.mian.gitnex.R; -import org.mian.gitnex.clients.RetrofitClient; -import org.mian.gitnex.databinding.ActivityAccountSettingsEmailBinding; -import org.mian.gitnex.fragments.AccountSettingsEmailsFragment; -import org.mian.gitnex.helpers.AlertDialogs; -import org.mian.gitnex.helpers.SnackBar; -import retrofit2.Call; -import retrofit2.Callback; - -/** - * @author M M Arif - */ -public class AccountSettingsEmailActivity extends BaseActivity { - - private ActivityAccountSettingsEmailBinding activityAccountSettingsEmailBinding; - - @Override - public void onCreate(Bundle savedInstanceState) { - - super.onCreate(savedInstanceState); - - activityAccountSettingsEmailBinding = - ActivityAccountSettingsEmailBinding.inflate(getLayoutInflater()); - setContentView(activityAccountSettingsEmailBinding.getRoot()); - - activityAccountSettingsEmailBinding.topAppBar.setNavigationOnClickListener(v -> finish()); - - activityAccountSettingsEmailBinding.topAppBar.setOnMenuItemClickListener( - menuItem -> { - int id = menuItem.getItemId(); - - if (id == R.id.save) { - processAddNewEmail(); - return true; - } else { - return super.onOptionsItemSelected(menuItem); - } - }); - } - - private void processAddNewEmail() { - - String newUserEmail = - Objects.requireNonNull(activityAccountSettingsEmailBinding.userEmail.getText()) - .toString() - .trim(); - - if (newUserEmail.equals("")) { - - SnackBar.error( - ctx, findViewById(android.R.id.content), getString(R.string.emailErrorEmpty)); - return; - } else if (!Patterns.EMAIL_ADDRESS.matcher(newUserEmail).matches()) { - - SnackBar.error( - ctx, findViewById(android.R.id.content), getString(R.string.emailErrorInvalid)); - return; - } - - List newEmailList = new ArrayList<>(Arrays.asList(newUserEmail.split(","))); - - addNewEmail(newEmailList); - } - - private void addNewEmail(List newUserEmail) { - - CreateEmailOption addEmailFunc = new CreateEmailOption(); - addEmailFunc.setEmails(newUserEmail); - - Call> call = RetrofitClient.getApiInterface(ctx).userAddEmail(addEmailFunc); - - call.enqueue( - new Callback<>() { - - @Override - public void onResponse( - @NonNull Call> call, - @NonNull retrofit2.Response> response) { - - if (response.code() == 201) { - - SnackBar.info( - ctx, - findViewById(android.R.id.content), - getString(R.string.emailAddedText)); - AccountSettingsEmailsFragment.refreshEmails = true; - new Handler().postDelayed(() -> finish(), 3000); - } else if (response.code() == 401) { - - AlertDialogs.authorizationTokenRevokedDialog(ctx); - } else if (response.code() == 403) { - - SnackBar.error( - ctx, - findViewById(android.R.id.content), - getString(R.string.authorizeError)); - } else if (response.code() == 404) { - - SnackBar.error( - ctx, - findViewById(android.R.id.content), - getString(R.string.apiNotFound)); - } else if (response.code() == 422) { - - SnackBar.error( - ctx, - findViewById(android.R.id.content), - getString(R.string.emailErrorInUse)); - } else { - - SnackBar.error( - ctx, - findViewById(android.R.id.content), - getString(R.string.genericError)); - } - } - - @Override - public void onFailure(@NonNull Call> call, @NonNull Throwable t) {} - }); - } -} diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateNoteActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateNoteActivity.java index 8db1ee64..a8aae6f7 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateNoteActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateNoteActivity.java @@ -67,6 +67,9 @@ public class CreateNoteActivity extends BaseActivity { notes = notesApi.fetchNoteById(noteId); binding.noteContent.setText(notes.getContent()); + assert notes.getContent() != null; + binding.noteContent.setSelection(notes.getContent().length()); + binding.markdownPreview.setVisibility(View.GONE); binding.toolbarTitle.setText(R.string.editNote); 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 cf118988..cf41006e 100644 --- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java @@ -26,6 +26,7 @@ import com.google.android.material.navigation.NavigationView; import java.util.ArrayList; import java.util.List; import org.gitnex.tea4j.v2.models.GeneralAPISettings; +import org.gitnex.tea4j.v2.models.GeneralAttachmentSettings; import org.gitnex.tea4j.v2.models.NotificationCount; import org.gitnex.tea4j.v2.models.ServerVersion; import org.gitnex.tea4j.v2.models.User; @@ -548,6 +549,7 @@ public class MainActivity extends BaseActivity giteaVersion(); serverPageLimitSettings(); + updateGeneralAttachmentSettings(); } }, 1500); @@ -568,6 +570,8 @@ public class MainActivity extends BaseActivity public void handleOnBackPressed() { if (drawer.isDrawerOpen(GravityCompat.START)) { drawer.closeDrawer(GravityCompat.START); + } else { + finish(); } } }; @@ -792,6 +796,46 @@ public class MainActivity extends BaseActivity return super.onOptionsItemSelected(item); } + private void updateGeneralAttachmentSettings() { + + Call generalAttachmentSettings = + RetrofitClient.getApiInterface(ctx).getGeneralAttachmentSettings(); + + generalAttachmentSettings.enqueue( + new Callback<>() { + + @Override + public void onResponse( + @NonNull final Call generalAPISettings, + @NonNull retrofit2.Response response) { + + if (response.code() == 200 && response.body() != null) { + + int max_size = 2; + int max_files = 5; + + if (response.body().getMaxSize() != null) { + max_size = Math.toIntExact(response.body().getMaxSize()); + } + if (response.body().getMaxFiles() != null) { + max_files = Math.toIntExact(response.body().getMaxFiles()); + } + + BaseApi.getInstance(ctx, UserAccountsApi.class) + .updateGeneralAttachmentSettings( + max_size, + max_files, + tinyDB.getInt("currentActiveAccountId")); + } + } + + @Override + public void onFailure( + @NonNull Call generalAPISettings, + @NonNull Throwable t) {} + }); + } + private void serverPageLimitSettings() { Call generalAPISettings = diff --git a/app/src/main/java/org/mian/gitnex/database/api/UserAccountsApi.java b/app/src/main/java/org/mian/gitnex/database/api/UserAccountsApi.java index 3f2df36a..f010cf50 100644 --- a/app/src/main/java/org/mian/gitnex/database/api/UserAccountsApi.java +++ b/app/src/main/java/org/mian/gitnex/database/api/UserAccountsApi.java @@ -53,6 +53,14 @@ public class UserAccountsApi extends BaseApi { maxResponseItems, defaultPagingNumber, accountId)); } + public void updateGeneralAttachmentSettings( + final int maxAttachmentsSize, final int maxNumberOfAttachments, final int accountId) { + executorService.execute( + () -> + userAccountsDao.updateGeneralAttachmentSettings( + maxAttachmentsSize, maxNumberOfAttachments, accountId)); + } + public void updateToken(final int accountId, final String token) { executorService.execute(() -> userAccountsDao.updateAccountToken(accountId, token)); } diff --git a/app/src/main/java/org/mian/gitnex/database/dao/UserAccountsDao.java b/app/src/main/java/org/mian/gitnex/database/dao/UserAccountsDao.java index ba9a40d0..21388fa2 100644 --- a/app/src/main/java/org/mian/gitnex/database/dao/UserAccountsDao.java +++ b/app/src/main/java/org/mian/gitnex/database/dao/UserAccountsDao.java @@ -47,6 +47,11 @@ public interface UserAccountsDao { "UPDATE UserAccounts SET maxResponseItems = :maxResponseItems, defaultPagingNumber = :defaultPagingNumber WHERE accountId = :accountId") void updateServerPagingLimit(int maxResponseItems, int defaultPagingNumber, int accountId); + @Query( + "UPDATE UserAccounts SET maxAttachmentsSize = :maxAttachmentsSize, maxNumberOfAttachments = :maxNumberOfAttachments WHERE accountId = :accountId") + void updateGeneralAttachmentSettings( + int maxAttachmentsSize, int maxNumberOfAttachments, int accountId); + @Query("UPDATE UserAccounts SET accountName = :accountName WHERE accountId = :accountId") void updateAccountName(String accountName, int accountId); diff --git a/app/src/main/java/org/mian/gitnex/database/db/GitnexDatabase.java b/app/src/main/java/org/mian/gitnex/database/db/GitnexDatabase.java index 2f320601..88b77e8b 100644 --- a/app/src/main/java/org/mian/gitnex/database/db/GitnexDatabase.java +++ b/app/src/main/java/org/mian/gitnex/database/db/GitnexDatabase.java @@ -29,7 +29,7 @@ import org.mian.gitnex.database.models.UserAccount; Notes.class, AppSettings.class }, - version = 8, + version = 9, exportSchema = false) public abstract class GitnexDatabase extends RoomDatabase { @@ -97,6 +97,18 @@ public abstract class GitnexDatabase extends RoomDatabase { "CREATE TABLE IF NOT EXISTS 'appSettings' ('settingId' INTEGER NOT NULL, 'settingKey' TEXT, 'settingValue' TEXT, 'settingDefault' TEXT, PRIMARY KEY('settingId'))"); } }; + + private static final Migration MIGRATION_8_9 = + new Migration(8, 9) { + + @Override + public void migrate(@NonNull SupportSQLiteDatabase database) { + database.execSQL( + "ALTER TABLE 'userAccounts' ADD COLUMN 'maxAttachmentsSize' INTEGER NOT NULL DEFAULT 2"); + database.execSQL( + "ALTER TABLE 'userAccounts' ADD COLUMN 'maxNumberOfAttachments' INTEGER NOT NULL DEFAULT 5"); + } + }; private static volatile GitnexDatabase gitnexDatabase; public static GitnexDatabase getDatabaseInstance(Context context) { @@ -116,7 +128,8 @@ public abstract class GitnexDatabase extends RoomDatabase { MIGRATION_4_5, MIGRATION_5_6, MIGRATION_6_7, - MIGRATION_7_8) + MIGRATION_7_8, + MIGRATION_8_9) .build(); } } diff --git a/app/src/main/java/org/mian/gitnex/database/models/UserAccount.java b/app/src/main/java/org/mian/gitnex/database/models/UserAccount.java index e19ae76c..c426cf41 100644 --- a/app/src/main/java/org/mian/gitnex/database/models/UserAccount.java +++ b/app/src/main/java/org/mian/gitnex/database/models/UserAccount.java @@ -22,6 +22,8 @@ public class UserAccount implements Serializable { private boolean isLoggedIn; private int maxResponseItems; private int defaultPagingNumber; + private int maxAttachmentsSize; + private int maxNumberOfAttachments; public int getAccountId() { return accountId; @@ -94,4 +96,20 @@ public class UserAccount implements Serializable { public void setDefaultPagingNumber(int defaultPagingNumber) { this.defaultPagingNumber = defaultPagingNumber; } + + public int getMaxAttachmentsSize() { + return maxAttachmentsSize; + } + + public void setMaxAttachmentsSize(int maxAttachmentsSize) { + this.maxAttachmentsSize = maxAttachmentsSize; + } + + public int getMaxNumberOfAttachments() { + return maxNumberOfAttachments; + } + + public void setMaxNumberOfAttachments(int maxNumberOfAttachments) { + this.maxNumberOfAttachments = maxNumberOfAttachments; + } } diff --git a/app/src/main/java/org/mian/gitnex/fragments/AccountSettingsEmailsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/AccountSettingsEmailsFragment.java index 66599551..5ee3c038 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/AccountSettingsEmailsFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/AccountSettingsEmailsFragment.java @@ -1,7 +1,7 @@ package org.mian.gitnex.fragments; import android.annotation.SuppressLint; -import android.content.Intent; +import android.content.Context; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -9,14 +9,28 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import org.mian.gitnex.activities.AccountSettingsEmailActivity; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import org.gitnex.tea4j.v2.models.CreateEmailOption; +import org.gitnex.tea4j.v2.models.Email; +import org.mian.gitnex.R; import org.mian.gitnex.adapters.AccountSettingsEmailsAdapter; +import org.mian.gitnex.clients.RetrofitClient; +import org.mian.gitnex.databinding.CustomAccountSettingsAddNewEmailBinding; import org.mian.gitnex.databinding.FragmentAccountSettingsEmailsBinding; +import org.mian.gitnex.helpers.AlertDialogs; +import org.mian.gitnex.helpers.Toasty; import org.mian.gitnex.viewmodels.AccountSettingsEmailsViewModel; +import retrofit2.Call; +import retrofit2.Callback; /** * @author M M Arif @@ -25,7 +39,11 @@ public class AccountSettingsEmailsFragment extends Fragment { public static boolean refreshEmails = false; private AccountSettingsEmailsViewModel accountSettingsEmailsViewModel; + private CustomAccountSettingsAddNewEmailBinding customAccountSettingsAddNewEmailBinding; private AccountSettingsEmailsAdapter adapter; + private Context context; + private MaterialAlertDialogBuilder materialAlertDialogBuilder; + private AlertDialog dialogSaveEmail; public AccountSettingsEmailsFragment() {} @@ -40,6 +58,13 @@ public class AccountSettingsEmailsFragment extends Fragment { accountSettingsEmailsViewModel = new ViewModelProvider(this).get(AccountSettingsEmailsViewModel.class); + context = getContext(); + + assert context != null; + materialAlertDialogBuilder = + new MaterialAlertDialogBuilder( + context, R.style.ThemeOverlay_Material3_Dialog_Alert); + final SwipeRefreshLayout swipeRefresh = fragmentAccountSettingsEmailsBinding.pullToRefresh; fragmentAccountSettingsEmailsBinding.recyclerView.setHasFixedSize(true); @@ -60,11 +85,79 @@ public class AccountSettingsEmailsFragment extends Fragment { fetchDataAsync(); fragmentAccountSettingsEmailsBinding.addNewEmailAddress.setOnClickListener( - v1 -> startActivity(new Intent(getContext(), AccountSettingsEmailActivity.class))); + editProperties -> showAddEmailDialog()); return fragmentAccountSettingsEmailsBinding.getRoot(); } + private void showAddEmailDialog() { + + customAccountSettingsAddNewEmailBinding = + CustomAccountSettingsAddNewEmailBinding.inflate(LayoutInflater.from(context)); + + View view = customAccountSettingsAddNewEmailBinding.getRoot(); + materialAlertDialogBuilder.setView(view); + + customAccountSettingsAddNewEmailBinding.save.setOnClickListener( + saveKey -> { + if (Objects.requireNonNull( + customAccountSettingsAddNewEmailBinding.userEmail.getText()) + .toString() + .isEmpty()) { + Toasty.error(context, getString(R.string.emailErrorEmpty)); + } else { + addNewEmail( + String.valueOf( + customAccountSettingsAddNewEmailBinding.userEmail + .getText())); + } + }); + + dialogSaveEmail = materialAlertDialogBuilder.show(); + } + + private void addNewEmail(String email) { + + List newEmailList = new ArrayList<>(Arrays.asList(email.split(","))); + + CreateEmailOption addEmailFunc = new CreateEmailOption(); + addEmailFunc.setEmails(newEmailList); + + Call> call = RetrofitClient.getApiInterface(context).userAddEmail(addEmailFunc); + + call.enqueue( + new Callback<>() { + + @Override + public void onResponse( + @NonNull Call> call, + @NonNull retrofit2.Response> response) { + + if (response.code() == 201) { + + dialogSaveEmail.dismiss(); + accountSettingsEmailsViewModel.loadEmailsList(context); + Toasty.success(context, getString(R.string.emailAddedText)); + } else if (response.code() == 401) { + + AlertDialogs.authorizationTokenRevokedDialog(context); + } else if (response.code() == 403) { + + Toasty.error(context, getString(R.string.authorizeError)); + } else if (response.code() == 422) { + + Toasty.error(context, getString(R.string.emailErrorInUse)); + } else { + + Toasty.error(context, getString(R.string.genericError)); + } + } + + @Override + public void onFailure(@NonNull Call> call, @NonNull Throwable t) {} + }); + } + @SuppressLint("NotifyDataSetChanged") private void fetchDataAsync() { diff --git a/app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java index 8eab1815..05909375 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java @@ -149,6 +149,7 @@ public class MyIssuesFragment extends Fragment { MenuItem searchItem = menu.findItem(R.id.action_search); androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView(); + assert searchView != null; searchView.setImeOptions(EditorInfo.IME_ACTION_DONE); searchView.setOnQueryTextListener( diff --git a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java index 87434fed..3eac4aeb 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java @@ -16,6 +16,7 @@ import android.widget.LinearLayout; import android.widget.SeekBar; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.amulyakhare.textdrawable.TextDrawable; import com.google.android.material.dialog.MaterialAlertDialogBuilder; @@ -101,6 +102,14 @@ public class RepoInfoFragment extends Fragment { binding.fileContentsFrameHeader.setOnClickListener(v1 -> toggleExpandView()); binding.repoMetaFrameHeader.setOnClickListener(v12 -> toggleExpandViewMeta()); + if (repository.isStarred()) { + binding.repoMetaStars.setIcon( + ContextCompat.getDrawable(requireContext(), R.drawable.ic_star)); + } else { + binding.repoMetaStars.setIcon( + ContextCompat.getDrawable(requireContext(), R.drawable.ic_star_unfilled)); + } + binding.repoMetaStars.setOnClickListener( metaStars -> ctx.startActivity(repository.getIntent(ctx, RepoStargazersActivity.class))); @@ -177,7 +186,7 @@ public class RepoInfoFragment extends Fragment { switch (response.code()) { case 200: assert response.body() != null; - if (response.body().size() > 0) { + if (!response.body().isEmpty()) { ArrayList seekbarItemList = new ArrayList<>(); diff --git a/app/src/main/java/org/mian/gitnex/fragments/SSHKeysFragment.java b/app/src/main/java/org/mian/gitnex/fragments/SSHKeysFragment.java index fbab2c7c..d6782cfc 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/SSHKeysFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/SSHKeysFragment.java @@ -22,6 +22,7 @@ import org.mian.gitnex.adapters.SSHKeysAdapter; import org.mian.gitnex.clients.RetrofitClient; import org.mian.gitnex.databinding.CustomAccountSettingsAddSshKeyBinding; import org.mian.gitnex.databinding.FragmentAccountSettingsSshKeysBinding; +import org.mian.gitnex.helpers.AlertDialogs; import org.mian.gitnex.helpers.Toasty; import org.mian.gitnex.viewmodels.AccountSettingsSSHKeysViewModel; import retrofit2.Call; @@ -137,6 +138,12 @@ public class SSHKeysFragment extends Fragment { dialogSaveKey.dismiss(); accountSettingsSSHKeysViewModel.loadKeysList(context); Toasty.success(context, getString(R.string.sshKeySuccess)); + } else if (response.code() == 401) { + + AlertDialogs.authorizationTokenRevokedDialog(context); + } else if (response.code() == 403) { + + Toasty.error(context, getString(R.string.authorizeError)); } else if (response.code() == 422) { Toasty.error(context, getString(R.string.sshKeyError)); diff --git a/app/src/main/java/org/mian/gitnex/fragments/profile/DetailFragment.java b/app/src/main/java/org/mian/gitnex/fragments/profile/DetailFragment.java index 2514bfbb..245f053c 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/profile/DetailFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/profile/DetailFragment.java @@ -310,15 +310,15 @@ public class DetailFragment extends Fragment { response.body().getFullName()); } if (!response.body().getDescription().isEmpty()) { - customEditProfileBinding.fullname.setText( + customEditProfileBinding.description.setText( response.body().getDescription()); } if (!response.body().getLocation().isEmpty()) { - customEditProfileBinding.fullname.setText( + customEditProfileBinding.location.setText( response.body().getLocation()); } if (!response.body().getWebsite().isEmpty()) { - customEditProfileBinding.fullname.setText( + customEditProfileBinding.website.setText( response.body().getWebsite()); } customEditProfileBinding.hideEmail.setChecked( diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/IssueCommentsViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/IssueCommentsViewModel.java index c69302aa..e81f86e6 100644 --- a/app/src/main/java/org/mian/gitnex/viewmodels/IssueCommentsViewModel.java +++ b/app/src/main/java/org/mian/gitnex/viewmodels/IssueCommentsViewModel.java @@ -38,8 +38,7 @@ public class IssueCommentsViewModel extends ViewModel { Call> call = RetrofitClient.getApiInterface(ctx) - .issueGetCommentsAndTimeline( - owner, repo, (long) index, null, 1, resultLimit, null); + .issueGetCommentsAndTimeline(owner, repo, (long) index, null, 1, 50, null); call.enqueue( new Callback<>() { @@ -83,7 +82,7 @@ public class IssueCommentsViewModel extends ViewModel { Call> call = RetrofitClient.getApiInterface(ctx) .issueGetCommentsAndTimeline( - owner, repo, (long) index, null, page, resultLimit, null); + owner, repo, (long) index, null, page, 50, null); call.enqueue( new Callback<>() { diff --git a/app/src/main/res/layout/activity_account_settings_email.xml b/app/src/main/res/layout/activity_account_settings_email.xml deleted file mode 100644 index 230abce4..00000000 --- a/app/src/main/res/layout/activity_account_settings_email.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_add_collaborator_to_repository.xml b/app/src/main/res/layout/activity_add_collaborator_to_repository.xml index 8d2f25d7..6e1aabb9 100644 --- a/app/src/main/res/layout/activity_add_collaborator_to_repository.xml +++ b/app/src/main/res/layout/activity_add_collaborator_to_repository.xml @@ -83,7 +83,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:singleLine="true" android:imeOptions="actionSend" diff --git a/app/src/main/res/layout/activity_add_new_account.xml b/app/src/main/res/layout/activity_add_new_account.xml index 660dc7ef..a3df6471 100644 --- a/app/src/main/res/layout/activity_add_new_account.xml +++ b/app/src/main/res/layout/activity_add_new_account.xml @@ -94,7 +94,6 @@ android:imeOptions="actionNext" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> @@ -122,7 +121,6 @@ android:imeOptions="actionNext" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> diff --git a/app/src/main/res/layout/activity_add_new_team_member.xml b/app/src/main/res/layout/activity_add_new_team_member.xml index 43a88518..b459c9a7 100644 --- a/app/src/main/res/layout/activity_add_new_team_member.xml +++ b/app/src/main/res/layout/activity_add_new_team_member.xml @@ -84,7 +84,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:singleLine="true" android:inputType="text" diff --git a/app/src/main/res/layout/activity_create_file.xml b/app/src/main/res/layout/activity_create_file.xml index 2d0a3f1b..0d2cd649 100644 --- a/app/src/main/res/layout/activity_create_file.xml +++ b/app/src/main/res/layout/activity_create_file.xml @@ -69,7 +69,6 @@ android:imeOptions="actionNext" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> @@ -96,7 +95,6 @@ android:inputType="textMultiLine" android:scrollbars="vertical" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen14sp"/> @@ -165,7 +163,6 @@ android:inputType="textMultiLine|textCapSentences" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> diff --git a/app/src/main/res/layout/activity_create_issue.xml b/app/src/main/res/layout/activity_create_issue.xml index 44473e5a..d362f670 100644 --- a/app/src/main/res/layout/activity_create_issue.xml +++ b/app/src/main/res/layout/activity_create_issue.xml @@ -79,7 +79,6 @@ android:inputType="textCapSentences" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> @@ -106,7 +105,6 @@ android:inputType="textCapSentences|textMultiLine" android:scrollbars="vertical" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> @@ -140,7 +138,6 @@ android:layout_height="wrap_content" android:focusable="false" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> @@ -186,7 +183,6 @@ android:layout_height="wrap_content" android:focusable="false" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> @@ -211,7 +207,6 @@ android:layout_height="wrap_content" android:focusable="false" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> diff --git a/app/src/main/res/layout/activity_create_label.xml b/app/src/main/res/layout/activity_create_label.xml index e30ccf5f..88bfe65f 100644 --- a/app/src/main/res/layout/activity_create_label.xml +++ b/app/src/main/res/layout/activity_create_label.xml @@ -64,7 +64,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> diff --git a/app/src/main/res/layout/activity_create_milestone.xml b/app/src/main/res/layout/activity_create_milestone.xml index 2b566f39..0cba7814 100644 --- a/app/src/main/res/layout/activity_create_milestone.xml +++ b/app/src/main/res/layout/activity_create_milestone.xml @@ -67,7 +67,6 @@ android:inputType="textCapSentences" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> @@ -97,7 +96,6 @@ android:inputType="textCapSentences|textMultiLine" android:scrollbars="vertical" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> @@ -135,7 +133,6 @@ android:focusable="false" android:maxLines="1" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> diff --git a/app/src/main/res/layout/activity_create_new_user.xml b/app/src/main/res/layout/activity_create_new_user.xml index 53520e37..5508e9eb 100644 --- a/app/src/main/res/layout/activity_create_new_user.xml +++ b/app/src/main/res/layout/activity_create_new_user.xml @@ -67,7 +67,6 @@ android:inputType="textCapSentences" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> @@ -93,7 +92,6 @@ android:imeOptions="actionNext" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> @@ -119,7 +117,6 @@ android:imeOptions="actionNext" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> @@ -144,7 +141,6 @@ android:layout_height="wrap_content" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> diff --git a/app/src/main/res/layout/activity_create_note.xml b/app/src/main/res/layout/activity_create_note.xml index 1cd8a0b7..54a6914a 100644 --- a/app/src/main/res/layout/activity_create_note.xml +++ b/app/src/main/res/layout/activity_create_note.xml @@ -67,7 +67,6 @@ android:background="?attr/primaryBackgroundColor" android:textColor="?attr/inputTextColor" android:hint="@string/newNoteContentHint" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" android:autofillHints="@string/newNoteContentHint" /> diff --git a/app/src/main/res/layout/activity_create_organization.xml b/app/src/main/res/layout/activity_create_organization.xml index 90bfd1f2..070b1cbc 100644 --- a/app/src/main/res/layout/activity_create_organization.xml +++ b/app/src/main/res/layout/activity_create_organization.xml @@ -67,7 +67,6 @@ android:inputType="textCapSentences" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> @@ -97,7 +96,6 @@ android:inputType="textCapSentences|textMultiLine" android:scrollbars="vertical" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> diff --git a/app/src/main/res/layout/activity_create_pr.xml b/app/src/main/res/layout/activity_create_pr.xml index 5c9627e4..64b3fb78 100644 --- a/app/src/main/res/layout/activity_create_pr.xml +++ b/app/src/main/res/layout/activity_create_pr.xml @@ -79,7 +79,6 @@ android:inputType="textCapSentences" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> @@ -106,7 +105,6 @@ android:inputType="textCapSentences|textMultiLine" android:scrollbars="vertical" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> @@ -209,7 +207,6 @@ android:layout_height="wrap_content" android:focusable="false" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> @@ -235,7 +232,6 @@ android:focusable="false" android:maxLines="1" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> diff --git a/app/src/main/res/layout/activity_create_release.xml b/app/src/main/res/layout/activity_create_release.xml index 9fc3484f..f01527e1 100644 --- a/app/src/main/res/layout/activity_create_release.xml +++ b/app/src/main/res/layout/activity_create_release.xml @@ -68,7 +68,6 @@ android:inputType="textCapSentences" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> @@ -95,7 +94,6 @@ android:inputType="textCapSentences" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> @@ -122,7 +120,6 @@ android:inputType="textCapSentences|textMultiLine" android:scrollbars="vertical" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> diff --git a/app/src/main/res/layout/activity_create_repo.xml b/app/src/main/res/layout/activity_create_repo.xml index b769f6d4..2cc08e5b 100644 --- a/app/src/main/res/layout/activity_create_repo.xml +++ b/app/src/main/res/layout/activity_create_repo.xml @@ -88,7 +88,6 @@ android:layout_height="wrap_content" android:inputType="textCapSentences" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> @@ -113,7 +112,6 @@ android:layout_height="wrap_content" android:inputType="textCapSentences" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:text="@string/main" android:textSize="@dimen/dimen16sp" /> @@ -166,7 +164,6 @@ android:gravity="top|start" android:inputType="textCapSentences|textMultiLine" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> diff --git a/app/src/main/res/layout/activity_create_team_by_org.xml b/app/src/main/res/layout/activity_create_team_by_org.xml index 87c13ad7..4b175440 100644 --- a/app/src/main/res/layout/activity_create_team_by_org.xml +++ b/app/src/main/res/layout/activity_create_team_by_org.xml @@ -67,7 +67,6 @@ android:inputType="textCapSentences" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> @@ -96,7 +95,6 @@ android:imeOptions="actionNext" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> @@ -120,7 +118,6 @@ android:focusable="false" android:maxLines="1" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> @@ -153,7 +150,6 @@ android:focusable="false" android:maxLines="1" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> diff --git a/app/src/main/res/layout/activity_edit_issue.xml b/app/src/main/res/layout/activity_edit_issue.xml index 1c7199e6..d3b5314a 100644 --- a/app/src/main/res/layout/activity_edit_issue.xml +++ b/app/src/main/res/layout/activity_edit_issue.xml @@ -67,7 +67,6 @@ android:inputType="textCapSentences" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> @@ -94,7 +93,6 @@ android:inputType="textCapSentences|textMultiLine" android:scrollbars="vertical" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> @@ -155,7 +153,6 @@ android:focusable="false" android:maxLines="1" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 76cb6fd5..85e90c44 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -132,7 +132,6 @@ android:inputType="textUri" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> @@ -159,7 +158,6 @@ android:layout_height="wrap_content" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> @@ -187,7 +185,6 @@ android:inputType="textPassword" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> @@ -218,7 +215,6 @@ android:inputType="number" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> @@ -245,7 +241,6 @@ android:layout_height="wrap_content" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> diff --git a/app/src/main/res/layout/activity_merge_pull_request.xml b/app/src/main/res/layout/activity_merge_pull_request.xml index 7f4db246..ceea1190 100644 --- a/app/src/main/res/layout/activity_merge_pull_request.xml +++ b/app/src/main/res/layout/activity_merge_pull_request.xml @@ -70,7 +70,6 @@ android:inputType="textCapSentences" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> @@ -96,7 +95,6 @@ android:gravity="top|start" android:inputType="textCapSentences" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp" /> diff --git a/app/src/main/res/layout/activity_wiki.xml b/app/src/main/res/layout/activity_wiki.xml index ea51ab62..61783586 100644 --- a/app/src/main/res/layout/activity_wiki.xml +++ b/app/src/main/res/layout/activity_wiki.xml @@ -137,7 +137,6 @@ android:inputType="textCapSentences" android:singleLine="true" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen16sp"/> @@ -161,7 +160,6 @@ android:minHeight="@dimen/dimen480dp" android:singleLine="false" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="@dimen/dimen14sp"/> diff --git a/app/src/main/res/layout/bottom_sheet_reply_layout.xml b/app/src/main/res/layout/bottom_sheet_reply_layout.xml index 3abf2e91..33ef26a7 100644 --- a/app/src/main/res/layout/bottom_sheet_reply_layout.xml +++ b/app/src/main/res/layout/bottom_sheet_reply_layout.xml @@ -98,7 +98,6 @@ android:padding="10dp" android:scrollbars="vertical" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/primaryTextColor" android:textColorHint="?attr/primaryBackgroundColor" android:textSize="16sp"/> diff --git a/app/src/main/res/layout/custom_account_settings_add_new_email.xml b/app/src/main/res/layout/custom_account_settings_add_new_email.xml new file mode 100644 index 00000000..ca718870 --- /dev/null +++ b/app/src/main/res/layout/custom_account_settings_add_new_email.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/custom_account_settings_add_ssh_key.xml b/app/src/main/res/layout/custom_account_settings_add_ssh_key.xml index 70f3f9b2..07a3ff98 100644 --- a/app/src/main/res/layout/custom_account_settings_add_ssh_key.xml +++ b/app/src/main/res/layout/custom_account_settings_add_ssh_key.xml @@ -38,7 +38,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="16sp" /> @@ -64,7 +63,6 @@ android:minHeight="@dimen/dimen180dp" android:singleLine="false" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="16sp" /> diff --git a/app/src/main/res/layout/custom_edit_profile.xml b/app/src/main/res/layout/custom_edit_profile.xml index ed5c4b7d..284f1b06 100644 --- a/app/src/main/res/layout/custom_edit_profile.xml +++ b/app/src/main/res/layout/custom_edit_profile.xml @@ -38,7 +38,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="16sp" /> @@ -64,7 +63,6 @@ android:minHeight="@dimen/dimen80dp" android:singleLine="false" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="16sp" /> @@ -86,7 +84,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="16sp" /> @@ -108,7 +105,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="16sp" /> diff --git a/app/src/main/res/layout/custom_repository_delete_dialog.xml b/app/src/main/res/layout/custom_repository_delete_dialog.xml index b051df81..48faaf5b 100644 --- a/app/src/main/res/layout/custom_repository_delete_dialog.xml +++ b/app/src/main/res/layout/custom_repository_delete_dialog.xml @@ -42,7 +42,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="16sp"/> diff --git a/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml b/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml index 7f992ae4..e1368b3b 100644 --- a/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml +++ b/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml @@ -47,7 +47,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="16sp"/> @@ -70,7 +69,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="16sp"/> @@ -93,7 +91,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="16sp"/> diff --git a/app/src/main/res/layout/custom_repository_transfer_dialog.xml b/app/src/main/res/layout/custom_repository_transfer_dialog.xml index 25cbec46..f1c98cc2 100644 --- a/app/src/main/res/layout/custom_repository_transfer_dialog.xml +++ b/app/src/main/res/layout/custom_repository_transfer_dialog.xml @@ -58,7 +58,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="16sp"/> @@ -81,7 +80,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="?attr/inputTextColor" - android:textColorHighlight="?attr/hintColor" android:textColorHint="?attr/hintColor" android:textSize="16sp"/> diff --git a/app/src/main/res/layout/fragment_repo_info.xml b/app/src/main/res/layout/fragment_repo_info.xml index 27f31a00..864c4e8a 100644 --- a/app/src/main/res/layout/fragment_repo_info.xml +++ b/app/src/main/res/layout/fragment_repo_info.xml @@ -160,7 +160,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> -