Enhancements and improvements (#1403)
closes #1388 Reviewed-on: #1403 Co-authored-by: M M Arif <mmarif@swatian.com> Co-committed-by: M M Arif <mmarif@swatian.com>
This commit is contained in:
parent a288555076
commit cad36de367
67 changed files with 1232 additions and 527 deletions
| @ -7,12 +7,12 @@ android { | |||
defaultConfig { | ||||
applicationId "org.mian.gitnex" | ||||
minSdkVersion 23 | ||||
targetSdkVersion 34 | ||||
targetSdkVersion 35 | ||||
versionCode 695 | ||||
versionName "7.0.0-dev" | ||||
multiDexEnabled true | ||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" | ||||
compileSdk 34 | ||||
compileSdk 35 | ||||
} | ||||
flavorDimensions = ["default"] | ||||
productFlavors { | ||||
| @ -106,7 +106,7 @@ dependencies { | |||
implementation 'ch.acra:acra-notification:5.11.3' | ||||
implementation 'androidx.room:room-runtime:2.6.1' | ||||
annotationProcessor 'androidx.room:room-compiler:2.6.1' | ||||
implementation "androidx.work:work-runtime:2.9.1" | ||||
implementation "androidx.work:work-runtime:2.10.0" | ||||
implementation "io.mikael:urlbuilder:2.0.9" | ||||
implementation "org.codeberg.gitnex-garage:emoji-java:v5.1.2" | ||||
//noinspection GradleDependency | ||||
| |
| @ -61,7 +61,7 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity { | |||
activityAddCollaboratorToRepositoryBinding | ||||
.addCollaboratorSearch.getText()) | ||||
.toString() | ||||
.equals("")) { | ||||
.isEmpty()) { | ||||
| ||||
activityAddCollaboratorToRepositoryBinding.progressBar.setVisibility( | ||||
View.VISIBLE); | ||||
| @ -128,7 +128,9 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity { | |||
activityAddCollaboratorToRepositoryBinding.noData.setVisibility(View.GONE); | ||||
} else { | ||||
| ||||
activityAddCollaboratorToRepositoryBinding.recyclerViewUserSearch.setAdapter(null); | ||||
activityAddCollaboratorToRepositoryBinding.noData.setVisibility(View.VISIBLE); | ||||
adapter.clearAdapter(); | ||||
} | ||||
| ||||
activityAddCollaboratorToRepositoryBinding.progressBar.setVisibility(View.GONE); | ||||
| |
| @ -118,7 +118,7 @@ public class AddNewTeamMemberActivity extends BaseActivity { | |||
if (response.isSuccessful()) { | ||||
| ||||
assert response.body() != null; | ||||
if (response.body().getData().size() > 0) { | ||||
if (!response.body().getData().isEmpty()) { | ||||
| ||||
dataList.clear(); | ||||
dataList.addAll(response.body().getData()); | ||||
| @ -126,7 +126,9 @@ public class AddNewTeamMemberActivity extends BaseActivity { | |||
noData.setVisibility(View.GONE); | ||||
} else { | ||||
| ||||
dataList.clear(); | ||||
noData.setVisibility(View.VISIBLE); | ||||
mRecyclerView.setAdapter(null); | ||||
} | ||||
| ||||
mProgressBar.setVisibility(View.GONE); | ||||
| |
| @ -61,6 +61,7 @@ public class CreateNoteActivity extends BaseActivity { | |||
binding.close.setOnClickListener(close -> finish()); | ||||
binding.toolbarTitle.setMovementMethod(new ScrollingMovementMethod()); | ||||
| ||||
assert action != null; | ||||
if (action.equalsIgnoreCase("edit")) { | ||||
| ||||
noteId = getIntent().getIntExtra("noteId", 0); | ||||
| |
File diff suppressed because it is too large Load diff
| @ -535,7 +535,7 @@ public class IssueDetailActivity extends BaseActivity | |||
viewBinding.commentReply.setText(null); | ||||
viewBinding.commentReply.clearFocus(); | ||||
imm.toggleSoftInput( | ||||
InputMethodManager.HIDE_IMPLICIT_ONLY, 0); | ||||
InputMethodManager.SHOW_IMPLICIT, 0); | ||||
} else { | ||||
| ||||
Toasty.error(ctx, getString(R.string.genericError)); | ||||
| @ -1785,7 +1785,7 @@ public class IssueDetailActivity extends BaseActivity | |||
viewBinding.send.setEnabled(false); | ||||
viewBinding.commentReply.setText(null); | ||||
viewBinding.commentReply.clearFocus(); | ||||
imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0); | ||||
imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0); | ||||
| ||||
} else if (response.code() == 401) { | ||||
| ||||
| |
| @ -10,6 +10,7 @@ import android.view.MenuItem; | |||
import android.view.View; | ||||
import android.widget.ImageView; | ||||
import android.widget.TextView; | ||||
import androidx.activity.EdgeToEdge; | ||||
import androidx.activity.OnBackPressedCallback; | ||||
import androidx.annotation.NonNull; | ||||
import androidx.appcompat.app.ActionBarDrawerToggle; | ||||
| @ -93,6 +94,7 @@ public class MainActivity extends BaseActivity | |||
public void onCreate(Bundle savedInstanceState) { | ||||
| ||||
super.onCreate(savedInstanceState); | ||||
EdgeToEdge.enable(this); | ||||
| ||||
ActivityMainBinding activityMainBinding = ActivityMainBinding.inflate(getLayoutInflater()); | ||||
setContentView(activityMainBinding.getRoot()); | ||||
| |
| @ -222,11 +222,11 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe | |||
filterMilestoneBottomSheet.show( | ||||
getSupportFragmentManager(), "repoFilterMenuMilestoneBottomSheet"); | ||||
return true; | ||||
} else if (id == R.id.switchBranches) { | ||||
} /*else if (id == R.id.switchBranches) { | ||||
| ||||
chooseBranch(); | ||||
return true; | ||||
} else if (id == R.id.branchCommits) { | ||||
}*/ else if (id == R.id.branchCommits) { | ||||
| ||||
Intent intent = repository.getIntent(ctx, CommitsActivity.class); | ||||
| ||||
| |
| @ -1,5 +1,6 @@ | |||
package org.mian.gitnex.adapters; | ||||
| ||||
import android.annotation.SuppressLint; | ||||
import android.content.Context; | ||||
import android.content.Intent; | ||||
import android.os.Handler; | ||||
| @ -99,7 +100,7 @@ public class CollaboratorSearchAdapter | |||
currentItem.getLogin()); | ||||
| ||||
call.enqueue( | ||||
new Callback<Void>() { | ||||
new Callback<>() { | ||||
| ||||
@Override | ||||
public void onResponse( | ||||
| @ -138,6 +139,12 @@ public class CollaboratorSearchAdapter | |||
return usersSearchList.size(); | ||||
} | ||||
| ||||
@SuppressLint("NotifyDataSetChanged") | ||||
public void clearAdapter() { | ||||
usersSearchList.clear(); | ||||
notifyDataSetChanged(); | ||||
} | ||||
| ||||
public class CollaboratorSearchViewHolder extends RecyclerView.ViewHolder { | ||||
| ||||
private final ImageView userAvatar; | ||||
| |
| @ -18,6 +18,7 @@ import com.amulyakhare.textdrawable.TextDrawable; | |||
import com.amulyakhare.textdrawable.util.ColorGenerator; | ||||
import com.bumptech.glide.Glide; | ||||
import com.bumptech.glide.load.engine.DiskCacheStrategy; | ||||
import com.google.android.material.card.MaterialCardView; | ||||
import java.util.ArrayList; | ||||
import java.util.List; | ||||
import java.util.Locale; | ||||
| @ -164,6 +165,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold | |||
private final View spacerView; | ||||
private org.gitnex.tea4j.v2.models.Repository userRepositories; | ||||
private CheckBox isRepoAdmin; | ||||
private MaterialCardView isRepoArchivedFrame; | ||||
| ||||
ReposHolder(View itemView) { | ||||
| ||||
| @ -176,6 +178,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold | |||
repoStars = itemView.findViewById(R.id.repoStars); | ||||
repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated); | ||||
spacerView = itemView.findViewById(R.id.spacerView); | ||||
isRepoArchivedFrame = itemView.findViewById(R.id.repo_is_archived_frame); | ||||
| ||||
itemView.setOnClickListener( | ||||
v -> { | ||||
| @ -254,6 +257,12 @@ public class ReposListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold | |||
isRepoAdmin = new CheckBox(context); | ||||
} | ||||
isRepoAdmin.setChecked(repositories.getPermissions().isAdmin()); | ||||
| ||||
if (repositories.isArchived()) { | ||||
isRepoArchivedFrame.setVisibility(View.VISIBLE); | ||||
} else { | ||||
isRepoArchivedFrame.setVisibility(View.GONE); | ||||
} | ||||
} | ||||
} | ||||
} | ||||
| |
| @ -1,6 +1,7 @@ | |||
package org.mian.gitnex.fragments; | ||||
| ||||
import android.annotation.SuppressLint; | ||||
import android.app.Dialog; | ||||
import android.content.Intent; | ||||
import android.net.Uri; | ||||
import android.os.Bundle; | ||||
| @ -17,17 +18,21 @@ import androidx.appcompat.widget.SearchView; | |||
import androidx.fragment.app.Fragment; | ||||
import androidx.lifecycle.ViewModelProvider; | ||||
import androidx.recyclerview.widget.LinearLayoutManager; | ||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder; | ||||
import java.util.ArrayList; | ||||
import java.util.Collections; | ||||
import java.util.List; | ||||
import java.util.Objects; | ||||
import moe.feng.common.view.breadcrumbs.DefaultBreadcrumbsCallback; | ||||
import moe.feng.common.view.breadcrumbs.model.BreadcrumbItem; | ||||
import org.gitnex.tea4j.v2.models.Branch; | ||||
import org.gitnex.tea4j.v2.models.ContentsResponse; | ||||
import org.mian.gitnex.R; | ||||
import org.mian.gitnex.activities.CreateFileActivity; | ||||
import org.mian.gitnex.activities.FileViewActivity; | ||||
import org.mian.gitnex.activities.RepoDetailActivity; | ||||
import org.mian.gitnex.adapters.FilesAdapter; | ||||
import org.mian.gitnex.clients.RetrofitClient; | ||||
import org.mian.gitnex.database.api.BaseApi; | ||||
import org.mian.gitnex.database.api.UserAccountsApi; | ||||
import org.mian.gitnex.database.models.UserAccount; | ||||
| @ -36,6 +41,9 @@ import org.mian.gitnex.helpers.AppUtil; | |||
import org.mian.gitnex.helpers.Path; | ||||
import org.mian.gitnex.helpers.contexts.RepositoryContext; | ||||
import org.mian.gitnex.viewmodels.FilesViewModel; | ||||
import retrofit2.Call; | ||||
import retrofit2.Callback; | ||||
import retrofit2.Response; | ||||
| ||||
/** | ||||
* @author M M Arif | ||||
| @ -79,6 +87,8 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter | |||
binding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); | ||||
binding.recyclerView.setAdapter(filesAdapter); | ||||
| ||||
binding.branchTitle.setText(repository.getBranchRef()); | ||||
| ||||
binding.breadcrumbsView.setItems( | ||||
new ArrayList<>( | ||||
Collections.singletonList( | ||||
| @ -172,6 +182,8 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter | |||
binding.newFile.setOnClickListener( | ||||
v17 -> startActivity(repository.getIntent(getContext(), CreateFileActivity.class))); | ||||
| ||||
binding.switchBranch.setOnClickListener(switchBranch -> chooseBranch()); | ||||
| ||||
return binding.getRoot(); | ||||
} | ||||
| ||||
| @ -220,10 +232,10 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter | |||
| ||||
for (UserAccount userAccount : userAccounts) { | ||||
Uri instanceUri = Uri.parse(userAccount.getInstanceUrl()); | ||||
if (instanceUri.getHost().toLowerCase().equals(host)) { | ||||
if (Objects.requireNonNull(instanceUri.getHost()).toLowerCase().equals(host)) { | ||||
account = userAccount; | ||||
// if scheme is wrong fix it | ||||
if (!url.getScheme().equals(instanceUri.getScheme())) { | ||||
if (!Objects.equals(url.getScheme(), instanceUri.getScheme())) { | ||||
url = AppUtil.changeScheme(url, instanceUri.getScheme()); | ||||
} | ||||
break; | ||||
| @ -281,7 +293,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter | |||
filesAdapter.getOriginalFiles().addAll(filesListMain); | ||||
filesAdapter.notifyOriginalDataSetChanged(); | ||||
| ||||
if (filesListMain.size() > 0) { | ||||
if (!filesListMain.isEmpty()) { | ||||
| ||||
AppUtil.setMultiVisibility( | ||||
View.VISIBLE, binding.recyclerView, binding.filesFrame); | ||||
| @ -322,7 +334,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter | |||
filesAdapter.getOriginalFiles().addAll(filesListMain2); | ||||
filesAdapter.notifyOriginalDataSetChanged(); | ||||
| ||||
if (filesListMain2.size() > 0) { | ||||
if (!filesListMain2.isEmpty()) { | ||||
| ||||
AppUtil.setMultiVisibility( | ||||
View.VISIBLE, binding.recyclerView, binding.filesFrame); | ||||
| @ -340,6 +352,70 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter | |||
}); | ||||
} | ||||
| ||||
private void chooseBranch() { | ||||
| ||||
Dialog progressDialog = new Dialog(requireContext()); | ||||
progressDialog.setCancelable(false); | ||||
progressDialog.setContentView(R.layout.custom_progress_loader); | ||||
progressDialog.show(); | ||||
| ||||
MaterialAlertDialogBuilder materialAlertDialogBuilder = | ||||
new MaterialAlertDialogBuilder( | ||||
requireContext(), R.style.ThemeOverlay_Material3_Dialog_Alert); | ||||
| ||||
Call<List<Branch>> call = | ||||
RetrofitClient.getApiInterface(requireContext()) | ||||
.repoListBranches(repository.getOwner(), repository.getName(), null, null); | ||||
| ||||
call.enqueue( | ||||
new Callback<>() { | ||||
| ||||
@Override | ||||
public void onResponse( | ||||
@NonNull Call<List<Branch>> call, | ||||
@NonNull Response<List<Branch>> response) { | ||||
| ||||
progressDialog.hide(); | ||||
if (response.code() == 200) { | ||||
| ||||
List<String> branchesList = new ArrayList<>(); | ||||
int selectedBranch = 0; | ||||
assert response.body() != null; | ||||
| ||||
for (int i = 0; i < response.body().size(); i++) { | ||||
| ||||
Branch branches = response.body().get(i); | ||||
branchesList.add(branches.getName()); | ||||
| ||||
if (repository.getBranchRef().equals(branches.getName())) { | ||||
selectedBranch = i; | ||||
} | ||||
} | ||||
| ||||
materialAlertDialogBuilder | ||||
.setTitle(R.string.pageTitleChooseBranch) | ||||
.setSingleChoiceItems( | ||||
branchesList.toArray(new String[0]), | ||||
selectedBranch, | ||||
(dialogInterface, i) -> { | ||||
repository.setBranchRef(branchesList.get(i)); | ||||
binding.branchTitle.setText(branchesList.get(i)); | ||||
| ||||
refresh(); | ||||
dialogInterface.dismiss(); | ||||
}) | ||||
.setNeutralButton(R.string.cancelButton, null); | ||||
materialAlertDialogBuilder.create().show(); | ||||
} | ||||
} | ||||
| ||||
@Override | ||||
public void onFailure(@NonNull Call<List<Branch>> call, @NonNull Throwable t) { | ||||
progressDialog.hide(); | ||||
} | ||||
}); | ||||
} | ||||
| ||||
@Override | ||||
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) { | ||||
| ||||
| @ -353,6 +429,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter | |||
MenuItem searchItem = menu.findItem(R.id.action_search); | ||||
| ||||
SearchView searchView = (SearchView) searchItem.getActionView(); | ||||
assert searchView != null; | ||||
searchView.setImeOptions(EditorInfo.IME_ACTION_DONE); | ||||
searchView.setOnQueryTextListener( | ||||
new SearchView.OnQueryTextListener() { | ||||
| |
| @ -286,19 +286,9 @@ public class RepoInfoFragment extends Fragment { | |||
AlertDialogs.authorizationTokenRevokedDialog(ctx); | ||||
break; | ||||
| ||||
case 403: | ||||
Toasty.error(ctx, ctx.getString(R.string.authorizeError)); | ||||
binding.languagesStatistic.setVisibility(View.GONE); | ||||
break; | ||||
| ||||
case 404: | ||||
binding.languagesStatistic.setVisibility(View.GONE); | ||||
break; | ||||
| ||||
default: | ||||
Toasty.error(getContext(), getString(R.string.genericError)); | ||||
binding.languagesStatistic.setVisibility(View.GONE); | ||||
break; | ||||
} | ||||
} | ||||
} | ||||
| @ -529,22 +519,10 @@ public class RepoInfoFragment extends Fragment { | |||
AlertDialogs.authorizationTokenRevokedDialog(ctx); | ||||
break; | ||||
| ||||
case 403: | ||||
Toasty.error(ctx, ctx.getString(R.string.authorizeError)); | ||||
binding.fileContentsFrameHeader.setVisibility(View.GONE); | ||||
binding.fileContentsFrame.setVisibility(View.GONE); | ||||
break; | ||||
| ||||
case 404: | ||||
binding.fileContentsFrameHeader.setVisibility(View.GONE); | ||||
binding.fileContentsFrame.setVisibility(View.GONE); | ||||
break; | ||||
| ||||
default: | ||||
Toasty.error(getContext(), getString(R.string.genericError)); | ||||
binding.fileContentsFrameHeader.setVisibility(View.GONE); | ||||
binding.fileContentsFrame.setVisibility(View.GONE); | ||||
break; | ||||
} | ||||
} | ||||
} | ||||
| |
| @ -1,10 +1,11 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | ||||
<LinearLayout android:layout_width="match_parent" | ||||
<androidx.coordinatorlayout.widget.CoordinatorLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:orientation="vertical" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appbar" | ||||
| @ -55,66 +56,69 @@ | |||
android:visibility="gone" | ||||
app:indicatorColor="?attr/progressIndicatorColor"/> | ||||
| ||||
<LinearLayout | ||||
<androidx.core.widget.NestedScrollView | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:layout_marginStart="@dimen/dimen10dp" | ||||
android:layout_marginEnd="@dimen/dimen10dp" | ||||
android:layout_marginTop="@dimen/dimen10dp" | ||||
android:layout_marginBottom="@dimen/dimen10dp"> | ||||
android:layout_height="match_parent" | ||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"> | ||||
| ||||
<com.google.android.material.textfield.TextInputLayout | ||||
android:id="@+id/addCollaboratorSearchLayout" | ||||
<LinearLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:textColorHint="?attr/hintColor" | ||||
app:hintTextColor="?attr/hintColor" | ||||
app:boxStrokeErrorColor="@color/darkRed" | ||||
android:layout_marginTop="@dimen/dimen8dp" | ||||
android:layout_marginBottom="@dimen/dimen8dp" | ||||
app:startIconDrawable="@drawable/ic_search" | ||||
app:startIconTint="?attr/iconsColor" | ||||
app:endIconMode="clear_text" | ||||
app:endIconTint="?attr/iconsColor" | ||||
android:hint="@string/addCollaboratorSearchHint"> | ||||
android:orientation="vertical" | ||||
android:padding="@dimen/dimen16dp"> | ||||
| ||||
<com.google.android.material.textfield.TextInputEditText | ||||
android:id="@+id/addCollaboratorSearch" | ||||
<com.google.android.material.textfield.TextInputLayout | ||||
android:id="@+id/addCollaboratorSearchLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:textColor="?attr/inputTextColor" | ||||
android:textColorHint="?attr/hintColor" | ||||
android:singleLine="true" | ||||
android:imeOptions="actionSend" | ||||
android:inputType="text" | ||||
android:textSize="@dimen/dimen16sp"/> | ||||
app:hintTextColor="?attr/hintColor" | ||||
app:boxStrokeErrorColor="@color/darkRed" | ||||
android:layout_marginBottom="@dimen/dimen8dp" | ||||
app:startIconDrawable="@drawable/ic_search" | ||||
app:startIconTint="?attr/iconsColor" | ||||
app:endIconMode="clear_text" | ||||
app:endIconTint="?attr/iconsColor" | ||||
android:hint="@string/addCollaboratorSearchHint"> | ||||
| ||||
</com.google.android.material.textfield.TextInputLayout> | ||||
<com.google.android.material.textfield.TextInputEditText | ||||
android:id="@+id/addCollaboratorSearch" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:textColor="?attr/inputTextColor" | ||||
android:textColorHint="?attr/hintColor" | ||||
android:singleLine="true" | ||||
android:imeOptions="actionSend" | ||||
android:inputType="text" | ||||
android:textSize="@dimen/dimen16sp"/> | ||||
| ||||
</LinearLayout> | ||||
</com.google.android.material.textfield.TextInputLayout> | ||||
| ||||
<TextView | ||||
android:id="@+id/noData" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:layout_margin="@dimen/dimen16dp" | ||||
android:gravity="center" | ||||
android:text="@string/noDataFound" | ||||
android:textColor="?attr/primaryTextColor" | ||||
android:textSize="@dimen/dimen20sp" | ||||
android:visibility="gone"/> | ||||
<TextView | ||||
android:id="@+id/noData" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:layout_margin="@dimen/dimen16dp" | ||||
android:gravity="center" | ||||
android:text="@string/noDataFound" | ||||
android:textColor="?attr/primaryTextColor" | ||||
android:textSize="@dimen/dimen20sp" | ||||
android:visibility="gone"/> | ||||
| ||||
<FrameLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:padding="@dimen/dimen8dp"> | ||||
<FrameLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<androidx.recyclerview.widget.RecyclerView | ||||
android:id="@+id/recyclerViewUserSearch" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent"/> | ||||
<androidx.recyclerview.widget.RecyclerView | ||||
android:id="@+id/recyclerViewUserSearch" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent"/> | ||||
| ||||
</FrameLayout> | ||||
</FrameLayout> | ||||
| ||||
</LinearLayout> | ||||
</LinearLayout> | ||||
| ||||
</androidx.core.widget.NestedScrollView> | ||||
| ||||
</androidx.coordinatorlayout.widget.CoordinatorLayout> | ||||
| |
| @ -4,14 +4,14 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
android:fitsSystemWindows="true" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appBarLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true"> | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<com.google.android.material.appbar.CollapsingToolbarLayout | ||||
style="?attr/collapsingToolbarLayoutLargeStyle" | ||||
| |
| @ -1,10 +1,11 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | ||||
<LinearLayout android:layout_width="match_parent" | ||||
<androidx.coordinatorlayout.widget.CoordinatorLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:orientation="vertical" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appbar" | ||||
| @ -55,15 +56,18 @@ | |||
style="@style/Widget.MaterialComponents.LinearProgressIndicator" | ||||
app:indicatorColor="?attr/progressIndicatorColor"/> | ||||
| ||||
<LinearLayout | ||||
<androidx.core.widget.NestedScrollView | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:layout_marginStart="@dimen/dimen10dp" | ||||
android:layout_marginEnd="@dimen/dimen10dp" | ||||
android:layout_marginTop="@dimen/dimen10dp" | ||||
android:layout_marginBottom="@dimen/dimen10dp"> | ||||
android:layout_height="match_parent" | ||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"> | ||||
| ||||
<com.google.android.material.textfield.TextInputLayout | ||||
<LinearLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:orientation="vertical" | ||||
android:padding="@dimen/dimen16dp"> | ||||
| ||||
<com.google.android.material.textfield.TextInputLayout | ||||
android:id="@+id/addNewTeamMemberLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
| @ -71,7 +75,6 @@ | |||
android:textColorHint="?attr/hintColor" | ||||
app:hintTextColor="?attr/hintColor" | ||||
app:boxStrokeErrorColor="@color/darkRed" | ||||
android:layout_marginTop="@dimen/dimen8dp" | ||||
android:layout_marginBottom="@dimen/dimen8dp" | ||||
app:startIconDrawable="@drawable/ic_search" | ||||
app:startIconTint="?attr/iconsColor" | ||||
| @ -89,32 +92,33 @@ | |||
android:inputType="text" | ||||
android:textSize="@dimen/dimen16sp"/> | ||||
| ||||
</com.google.android.material.textfield.TextInputLayout> | ||||
</com.google.android.material.textfield.TextInputLayout> | ||||
| ||||
</LinearLayout> | ||||
<TextView | ||||
android:id="@+id/noData" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:layout_margin="@dimen/dimen16dp" | ||||
android:gravity="center" | ||||
android:text="@string/noDataFound" | ||||
android:textColor="?attr/primaryTextColor" | ||||
android:textSize="@dimen/dimen20sp" | ||||
android:visibility="gone"/> | ||||
| ||||
<TextView | ||||
android:id="@+id/noData" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:layout_margin="@dimen/dimen16dp" | ||||
android:gravity="center" | ||||
android:text="@string/noDataFound" | ||||
android:textColor="?attr/primaryTextColor" | ||||
android:textSize="@dimen/dimen20sp" | ||||
android:visibility="gone"/> | ||||
<FrameLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<FrameLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:padding="@dimen/dimen8dp"> | ||||
<androidx.recyclerview.widget.RecyclerView | ||||
android:id="@+id/recyclerViewUserSearch" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent"/> | ||||
| ||||
<androidx.recyclerview.widget.RecyclerView | ||||
android:id="@+id/recyclerViewUserSearch" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent"/> | ||||
</FrameLayout> | ||||
| ||||
</FrameLayout> | ||||
</LinearLayout> | ||||
| ||||
</LinearLayout> | ||||
</androidx.core.widget.NestedScrollView> | ||||
| ||||
</androidx.coordinatorlayout.widget.CoordinatorLayout> | ||||
| |
| @ -1,10 +1,11 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | ||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
<androidx.coordinatorlayout.widget.CoordinatorLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:orientation="vertical"> | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appbar" | ||||
| @ -87,4 +88,4 @@ | |||
android:textSize="@dimen/dimen20sp" | ||||
android:visibility="gone" /> | ||||
| ||||
</RelativeLayout> | ||||
</androidx.coordinatorlayout.widget.CoordinatorLayout> | ||||
| |
| @ -5,6 +5,7 @@ | |||
android:layout_height="match_parent" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:orientation="vertical" | ||||
android:fitsSystemWindows="true" | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<FrameLayout | ||||
| |
| @ -4,6 +4,7 @@ | |||
xmlns:tools="http://schemas.android.com/tools" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:fitsSystemWindows="true" | ||||
android:orientation="vertical"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
| |
| @ -1,8 +1,10 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | ||||
<androidx.constraintlayout.widget.ConstraintLayout | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
<androidx.coordinatorlayout.widget.CoordinatorLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent"> | ||||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<FrameLayout | ||||
android:id="@+id/fragment_container" | ||||
| @ -10,4 +12,4 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor"/> | ||||
| ||||
</androidx.constraintlayout.widget.ConstraintLayout> | ||||
</androidx.coordinatorlayout.widget.CoordinatorLayout> | ||||
| |
| @ -1,10 +1,11 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | ||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
<androidx.coordinatorlayout.widget.CoordinatorLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:orientation="vertical"> | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appbar" | ||||
| @ -90,4 +91,4 @@ | |||
android:textSize="@dimen/dimen20sp" | ||||
android:visibility="gone"/> | ||||
| ||||
</RelativeLayout> | ||||
</androidx.coordinatorlayout.widget.CoordinatorLayout> | ||||
| |
| @ -4,14 +4,14 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appBarLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true"> | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<com.google.android.material.appbar.CollapsingToolbarLayout | ||||
style="?attr/collapsingToolbarLayoutLargeStyle" | ||||
| |
| @ -4,14 +4,14 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appBarLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true"> | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<com.google.android.material.appbar.CollapsingToolbarLayout | ||||
style="?attr/collapsingToolbarLayoutLargeStyle" | ||||
| |
| @ -4,14 +4,14 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appBarLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true"> | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<com.google.android.material.appbar.CollapsingToolbarLayout | ||||
style="?attr/collapsingToolbarLayoutLargeStyle" | ||||
| |
| @ -4,14 +4,14 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appBarLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true"> | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<com.google.android.material.appbar.CollapsingToolbarLayout | ||||
style="?attr/collapsingToolbarLayoutLargeStyle" | ||||
| |
| @ -4,14 +4,14 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appBarLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true"> | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<com.google.android.material.appbar.CollapsingToolbarLayout | ||||
style="?attr/collapsingToolbarLayoutLargeStyle" | ||||
| |
| @ -1,16 +1,17 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | ||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
<androidx.coordinatorlayout.widget.CoordinatorLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:orientation="vertical"> | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appbar" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:theme="@style/Widget.AppCompat.SearchView" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
app:elevation="@dimen/dimen0dp"> | ||||
| ||||
<com.google.android.material.appbar.MaterialToolbar | ||||
| @ -46,9 +47,10 @@ | |||
| ||||
</com.google.android.material.appbar.AppBarLayout> | ||||
| ||||
<ScrollView | ||||
<androidx.core.widget.NestedScrollView | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
app:layout_behavior="@string/appbar_scrolling_view_behavior" | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<LinearLayout | ||||
| @ -81,6 +83,6 @@ | |||
| ||||
</LinearLayout> | ||||
| ||||
</ScrollView> | ||||
</androidx.core.widget.NestedScrollView> | ||||
| ||||
</LinearLayout> | ||||
</androidx.coordinatorlayout.widget.CoordinatorLayout> | ||||
| |
| @ -4,14 +4,14 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appBarLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true"> | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<com.google.android.material.appbar.CollapsingToolbarLayout | ||||
style="?attr/collapsingToolbarLayoutLargeStyle" | ||||
| |
| @ -4,14 +4,14 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appBarLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true"> | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<com.google.android.material.appbar.CollapsingToolbarLayout | ||||
style="?attr/collapsingToolbarLayoutLargeStyle" | ||||
| @ -94,7 +94,7 @@ | |||
android:text="@string/insertNote" | ||||
android:textColor="?attr/primaryTextColor" | ||||
android:textSize="@dimen/dimen14sp"/> | ||||
| ||||
| ||||
<com.google.android.material.textfield.TextInputLayout | ||||
android:id="@+id/prBodyLayout" | ||||
android:layout_width="match_parent" | ||||
| |
| @ -4,14 +4,14 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appBarLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true"> | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<com.google.android.material.appbar.CollapsingToolbarLayout | ||||
style="?attr/collapsingToolbarLayoutLargeStyle" | ||||
| |
| @ -4,14 +4,14 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appBarLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true"> | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<com.google.android.material.appbar.CollapsingToolbarLayout | ||||
style="?attr/collapsingToolbarLayoutLargeStyle" | ||||
| |
| @ -4,14 +4,14 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appBarLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true"> | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<com.google.android.material.appbar.CollapsingToolbarLayout | ||||
style="?attr/collapsingToolbarLayoutLargeStyle" | ||||
| |
| @ -1,10 +1,11 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | ||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
<androidx.coordinatorlayout.widget.CoordinatorLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:orientation="vertical"> | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.progressindicator.LinearProgressIndicator | ||||
android:id="@+id/progressBar" | ||||
| @ -14,10 +15,10 @@ | |||
android:indeterminate="true" | ||||
app:indicatorColor="?attr/progressIndicatorColor" /> | ||||
| ||||
<ScrollView | ||||
<androidx.core.widget.NestedScrollView | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:orientation="horizontal"> | ||||
android:layout_height="match_parent" | ||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"> | ||||
| ||||
<LinearLayout | ||||
android:layout_width="match_parent" | ||||
| @ -158,6 +159,6 @@ | |||
| ||||
</LinearLayout> | ||||
| ||||
</ScrollView> | ||||
</androidx.core.widget.NestedScrollView> | ||||
| ||||
</LinearLayout> | ||||
</androidx.coordinatorlayout.widget.CoordinatorLayout> | ||||
| |
| @ -1,13 +1,14 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | ||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
<androidx.coordinatorlayout.widget.CoordinatorLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:orientation="vertical"> | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<FrameLayout | ||||
android:id="@+id/fragment_container" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent"/> | ||||
| ||||
</LinearLayout> | ||||
</androidx.coordinatorlayout.widget.CoordinatorLayout> | ||||
| |
| @ -4,14 +4,14 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appBarLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true"> | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<com.google.android.material.appbar.CollapsingToolbarLayout | ||||
style="?attr/collapsingToolbarLayoutLargeStyle" | ||||
| @ -158,6 +158,24 @@ | |||
| ||||
</com.google.android.material.textfield.TextInputLayout> | ||||
| ||||
<LinearLayout | ||||
android:id="@+id/attachmentFrame" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:visibility="gone" | ||||
android:orientation="vertical"> | ||||
| ||||
<LinearLayout | ||||
android:id="@+id/attachmentsView" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:layout_marginTop="@dimen/dimen12dp" | ||||
android:orientation="horizontal"> | ||||
| ||||
</LinearLayout> | ||||
| ||||
</LinearLayout> | ||||
| ||||
</LinearLayout> | ||||
| ||||
</androidx.core.widget.NestedScrollView> | ||||
| |
| @ -1,11 +1,11 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | ||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
xmlns:tools="http://schemas.android.com/tools" | ||||
<androidx.coordinatorlayout.widget.CoordinatorLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:orientation="vertical"> | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appbar" | ||||
| @ -61,6 +61,7 @@ | |||
<androidx.core.widget.NestedScrollView | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
app:layout_behavior="@string/appbar_scrolling_view_behavior" | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<LinearLayout | ||||
| @ -100,8 +101,7 @@ | |||
android:id="@+id/contents" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:visibility="gone" | ||||
tools:visibility="visible"/> | ||||
android:visibility="gone" /> | ||||
| ||||
<com.github.chrisbanes.photoview.PhotoView | ||||
android:id="@+id/photo_view" | ||||
| @ -114,4 +114,4 @@ | |||
| ||||
</androidx.core.widget.NestedScrollView> | ||||
| ||||
</LinearLayout> | ||||
</androidx.coordinatorlayout.widget.CoordinatorLayout> | ||||
| |
| @ -5,6 +5,7 @@ | |||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true" | ||||
android:orientation="vertical"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
| |
| @ -12,6 +12,8 @@ | |||
<LinearLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:fitsSystemWindows="true" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:orientation="vertical"> | ||||
| ||||
<com.google.android.material.appbar.MaterialToolbar | ||||
| @ -20,7 +22,6 @@ | |||
android:background="?attr/primaryBackgroundColor" | ||||
android:id="@+id/toolbar" | ||||
app:titleTextColor="?attr/primaryTextColor" | ||||
android:theme="@style/Widget.AppCompat.SearchView" | ||||
android:elevation="@dimen/dimen0dp"> | ||||
| ||||
<TextView | ||||
| |
| @ -4,14 +4,14 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appBarLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true"> | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<com.google.android.material.appbar.CollapsingToolbarLayout | ||||
style="?attr/collapsingToolbarLayoutLargeStyle" | ||||
| |
| @ -1,10 +1,11 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | ||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
<androidx.coordinatorlayout.widget.CoordinatorLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:orientation="vertical"> | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appbar" | ||||
| @ -63,4 +64,4 @@ | |||
android:layout_height="match_parent" | ||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"/> | ||||
| ||||
</LinearLayout> | ||||
</androidx.coordinatorlayout.widget.CoordinatorLayout> | ||||
| |
| @ -1,10 +1,11 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | ||||
<RelativeLayout | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
<androidx.coordinatorlayout.widget.CoordinatorLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appbar" | ||||
| @ -100,4 +101,4 @@ | |||
android:textSize="@dimen/dimen20sp" | ||||
android:visibility="gone"/> | ||||
| ||||
</RelativeLayout> | ||||
</androidx.coordinatorlayout.widget.CoordinatorLayout> | ||||
| |
| @ -1,18 +1,18 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | ||||
<LinearLayout | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
<androidx.coordinatorlayout.widget.CoordinatorLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:orientation="vertical"> | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appbar" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
app:elevation="@dimen/dimen0dp" | ||||
android:theme="@style/Widget.AppCompat.SearchView"> | ||||
android:theme="@style/Widget.AppCompat.SearchView" | ||||
app:elevation="@dimen/dimen0dp"> | ||||
| ||||
<com.google.android.material.appbar.MaterialToolbar | ||||
android:id="@+id/toolbar" | ||||
| @ -46,32 +46,47 @@ | |||
| ||||
</com.google.android.material.appbar.AppBarLayout> | ||||
| ||||
<GridView | ||||
android:id="@+id/gridView" | ||||
android:layout_width="wrap_content" | ||||
android:layout_height="wrap_content" | ||||
android:scrollbars="none" | ||||
android:numColumns="2" | ||||
android:gravity="center" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:padding="@dimen/dimen4dp"/> | ||||
| ||||
<com.google.android.material.progressindicator.LinearProgressIndicator | ||||
android:id="@+id/progress_bar" | ||||
<androidx.core.widget.NestedScrollView | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:indeterminate="true" | ||||
style="@style/Widget.MaterialComponents.LinearProgressIndicator" | ||||
app:indicatorColor="?attr/progressIndicatorColor"/> | ||||
app:layout_behavior="@string/appbar_scrolling_view_behavior" | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<TextView | ||||
android:id="@+id/noDataStargazers" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:gravity="center" | ||||
android:text="@string/noDataFound" | ||||
android:textColor="?attr/primaryTextColor" | ||||
android:textSize="@dimen/dimen20sp" | ||||
android:visibility="gone"/> | ||||
<LinearLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:orientation="vertical"> | ||||
| ||||
</LinearLayout> | ||||
<GridView | ||||
android:id="@+id/gridView" | ||||
android:layout_width="wrap_content" | ||||
android:layout_height="wrap_content" | ||||
android:scrollbars="none" | ||||
android:numColumns="2" | ||||
android:gravity="center" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:padding="@dimen/dimen4dp"/> | ||||
| ||||
<com.google.android.material.progressindicator.LinearProgressIndicator | ||||
android:id="@+id/progress_bar" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:indeterminate="true" | ||||
style="@style/Widget.MaterialComponents.LinearProgressIndicator" | ||||
app:indicatorColor="?attr/progressIndicatorColor"/> | ||||
| ||||
</LinearLayout> | ||||
| ||||
</androidx.core.widget.NestedScrollView> | ||||
| ||||
<TextView | ||||
android:id="@+id/noDataStargazers" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:gravity="center" | ||||
android:text="@string/noDataFound" | ||||
android:textColor="?attr/primaryTextColor" | ||||
android:textSize="@dimen/dimen20sp" | ||||
android:visibility="gone"/> | ||||
| ||||
</androidx.coordinatorlayout.widget.CoordinatorLayout> | ||||
| |
| @ -1,18 +1,18 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | ||||
<LinearLayout | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
<androidx.coordinatorlayout.widget.CoordinatorLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:orientation="vertical"> | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appbar" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
app:elevation="@dimen/dimen0dp" | ||||
android:theme="@style/Widget.AppCompat.SearchView"> | ||||
android:theme="@style/Widget.AppCompat.SearchView" | ||||
app:elevation="@dimen/dimen0dp"> | ||||
| ||||
<com.google.android.material.appbar.MaterialToolbar | ||||
android:id="@+id/toolbar" | ||||
| @ -46,23 +46,38 @@ | |||
| ||||
</com.google.android.material.appbar.AppBarLayout> | ||||
| ||||
<GridView | ||||
android:id="@+id/gridView" | ||||
android:layout_width="wrap_content" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:padding="@dimen/dimen4dp" | ||||
android:scrollbars="none" | ||||
android:numColumns="2" | ||||
android:gravity="center"/> | ||||
| ||||
<com.google.android.material.progressindicator.LinearProgressIndicator | ||||
android:id="@+id/progress_bar" | ||||
<androidx.core.widget.NestedScrollView | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:indeterminate="true" | ||||
style="@style/Widget.MaterialComponents.LinearProgressIndicator" | ||||
app:indicatorColor="?attr/progressIndicatorColor"/> | ||||
app:layout_behavior="@string/appbar_scrolling_view_behavior" | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<LinearLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:orientation="vertical"> | ||||
| ||||
<com.google.android.material.progressindicator.LinearProgressIndicator | ||||
android:id="@+id/progress_bar" | ||||
style="@style/Widget.MaterialComponents.LinearProgressIndicator" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:indeterminate="true" | ||||
app:indicatorColor="?attr/progressIndicatorColor"/> | ||||
| ||||
<GridView | ||||
android:id="@+id/gridView" | ||||
android:layout_width="wrap_content" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:padding="@dimen/dimen4dp" | ||||
android:scrollbars="none" | ||||
android:numColumns="2" | ||||
android:gravity="center"/> | ||||
| ||||
</LinearLayout> | ||||
| ||||
</androidx.core.widget.NestedScrollView> | ||||
| ||||
<TextView | ||||
android:id="@+id/noDataWatchers" | ||||
| @ -74,4 +89,4 @@ | |||
android:textSize="@dimen/dimen20sp" | ||||
android:visibility="gone"/> | ||||
| ||||
</LinearLayout> | ||||
</androidx.coordinatorlayout.widget.CoordinatorLayout> | ||||
| |
| @ -1,11 +1,11 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | ||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
xmlns:tools="http://schemas.android.com/tools" | ||||
<androidx.coordinatorlayout.widget.CoordinatorLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:orientation="vertical"> | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appbar" | ||||
| @ -48,8 +48,10 @@ | |||
| ||||
</com.google.android.material.appbar.AppBarLayout> | ||||
| ||||
<ScrollView android:layout_width="match_parent" | ||||
<androidx.core.widget.NestedScrollView | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
app:layout_behavior="@string/appbar_scrolling_view_behavior" | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<LinearLayout | ||||
| @ -75,6 +77,10 @@ | |||
<View | ||||
android:layout_width="match_parent" | ||||
android:layout_height="@dimen/dimen1dp" | ||||
android:layout_marginTop="@dimen/dimen4dp" | ||||
android:layout_marginBottom="@dimen/dimen4dp" | ||||
android:layout_marginStart="@dimen/dimen16dp" | ||||
android:layout_marginEnd="@dimen/dimen16dp" | ||||
android:background="?attr/dividerColor"/> | ||||
| ||||
<LinearLayout | ||||
| @ -84,8 +90,7 @@ | |||
android:background="?android:attr/selectableItemBackground" | ||||
android:clickable="true" | ||||
android:focusable="true" | ||||
android:orientation="vertical" | ||||
tools:visibility="visible"> | ||||
android:orientation="vertical"> | ||||
| ||||
<TextView | ||||
android:id="@+id/transferRepositoryOwnership" | ||||
| @ -116,6 +121,10 @@ | |||
<View | ||||
android:layout_width="match_parent" | ||||
android:layout_height="@dimen/dimen1dp" | ||||
android:layout_marginTop="@dimen/dimen4dp" | ||||
android:layout_marginBottom="@dimen/dimen4dp" | ||||
android:layout_marginStart="@dimen/dimen16dp" | ||||
android:layout_marginEnd="@dimen/dimen16dp" | ||||
android:background="?attr/dividerColor"/> | ||||
| ||||
</LinearLayout> | ||||
| @ -159,7 +168,7 @@ | |||
| ||||
</LinearLayout> | ||||
| ||||
</ScrollView> | ||||
</androidx.core.widget.NestedScrollView> | ||||
| ||||
</LinearLayout> | ||||
</androidx.coordinatorlayout.widget.CoordinatorLayout> | ||||
| ||||
| |
| @ -4,14 +4,14 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appBarLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true"> | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<com.google.android.material.appbar.CollapsingToolbarLayout | ||||
style="?attr/collapsingToolbarLayoutLargeStyle" | ||||
| |
| @ -4,14 +4,14 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appBarLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true"> | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<com.google.android.material.appbar.CollapsingToolbarLayout | ||||
style="?attr/collapsingToolbarLayoutLargeStyle" | ||||
| |
| @ -4,14 +4,14 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appBarLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true"> | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<com.google.android.material.appbar.CollapsingToolbarLayout | ||||
style="?attr/collapsingToolbarLayoutLargeStyle" | ||||
| |
| @ -4,14 +4,14 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appBarLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true"> | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<com.google.android.material.appbar.CollapsingToolbarLayout | ||||
style="?attr/collapsingToolbarLayoutLargeStyle" | ||||
| |
| @ -4,14 +4,14 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appBarLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true"> | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<com.google.android.material.appbar.CollapsingToolbarLayout | ||||
style="?attr/collapsingToolbarLayoutLargeStyle" | ||||
| |
| @ -4,14 +4,14 @@ | |||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appBarLayout" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:fitsSystemWindows="true"> | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
| ||||
<com.google.android.material.appbar.CollapsingToolbarLayout | ||||
style="?attr/collapsingToolbarLayoutLargeStyle" | ||||
| |
| @ -1,11 +1,11 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | ||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
xmlns:tools="http://schemas.android.com/tools" | ||||
<androidx.coordinatorlayout.widget.CoordinatorLayout | ||||
android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | ||||
android:background="?attr/primaryBackgroundColor" | ||||
android:orientation="vertical"> | ||||
xmlns:android="http://schemas.android.com/apk/res/android" | ||||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
android:fitsSystemWindows="true"> | ||||
| ||||
<com.google.android.material.appbar.AppBarLayout | ||||
android:id="@+id/appbar" | ||||
| @ -61,7 +61,8 @@ | |||
<androidx.core.widget.NestedScrollView | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:background="?attr/primaryBackgroundColor"> | ||||
android:background="?attr/primaryBackgroundColor" | ||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"> | ||||
| ||||
<LinearLayout | ||||
android:layout_width="match_parent" | ||||
| @ -101,8 +102,7 @@ | |||
android:id="@+id/contents" | ||||
android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | ||||
android:visibility="gone" | ||||
tools:visibility="visible"/> | ||||
android:visibility="gone" /> | ||||
| ||||
</LinearLayout> | ||||
| ||||
| @ -181,4 +181,4 @@ | |||
| ||||
</androidx.core.widget.NestedScrollView> | ||||
| ||||
</LinearLayout> | ||||
</androidx.coordinatorlayout.widget.CoordinatorLayout> | ||||
| |
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue