GitNex/GitNex
GitNex/GitNex
2
5
Fork 0
mirror of https://codeberg.org/gitnex/GitNex.git synced 2023-12-13 20:50:18 +01:00
Code Issues 1 Projects Releases Wiki Activity

Refactor security and code editor setting screens

Browse source
This commit is contained in:
M M Arif 2023-10-03 20:26:51 +05:00
parent 460d07d225
commit 3b6e60944f
12 changed files with 263 additions and 328 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
View file

@ -255,7 +255,10 @@ public class CreateIssueActivity extends BaseActivity
RequestBody requestFile = RequestBody requestFile =
RequestBody.create( RequestBody.create(
file, MediaType.parse(getContentResolver().getType(contentUri.get(i)))); file,
MediaType.parse(
Objects.requireNonNull(
getContentResolver().getType(contentUri.get(i)))));
uploadAttachments(requestFile, issueIndex, file.getName()); uploadAttachments(requestFile, issueIndex, file.getName());
} }

8
app/src/main/java/org/mian/gitnex/activities/SettingsCodeEditorActivity.java
View file

@ -15,7 +15,6 @@ public class SettingsCodeEditorActivity extends BaseActivity {
private static String[] colorList; private static String[] colorList;
private static int colorSelectedChoice = 0; private static int colorSelectedChoice = 0;
private View.OnClickListener onClickListener;
private static String[] indentationList; private static String[] indentationList;
private static int indentationSelectedChoice = 0; private static int indentationSelectedChoice = 0;
private static String[] indentationTabsList; private static String[] indentationTabsList;
@ -30,8 +29,7 @@ public class SettingsCodeEditorActivity extends BaseActivity {
ActivitySettingsCodeEditorBinding.inflate(getLayoutInflater()); ActivitySettingsCodeEditorBinding.inflate(getLayoutInflater());
setContentView(activitySettingsCodeEditorBinding.getRoot()); setContentView(activitySettingsCodeEditorBinding.getRoot());
initCloseListener(); activitySettingsCodeEditorBinding.topAppBar.setNavigationOnClickListener(v -> finish());
activitySettingsCodeEditorBinding.close.setOnClickListener(onClickListener);
// color selector dialog // color selector dialog
colorList = getResources().getStringArray(R.array.ceColors); colorList = getResources().getStringArray(R.array.ceColors);
@ -141,8 +139,4 @@ public class SettingsCodeEditorActivity extends BaseActivity {
materialAlertDialogBuilder.create().show(); materialAlertDialogBuilder.create().show();
}); });
} }
private void initCloseListener() {
onClickListener = view -> finish();
}
} }

51
app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java
View file

@ -7,10 +7,6 @@ import android.app.KeyguardManager;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.biometric.BiometricManager; import androidx.biometric.BiometricManager;
import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.io.File; import java.io.File;
@ -31,7 +27,6 @@ public class SettingsSecurityActivity extends BaseActivity {
private static int cacheSizeDataSelectedChoice = 0; private static int cacheSizeDataSelectedChoice = 0;
private static String[] cacheSizeImagesList; private static String[] cacheSizeImagesList;
private static int cacheSizeImagesSelectedChoice = 0; private static int cacheSizeImagesSelectedChoice = 0;
private View.OnClickListener onClickListener;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@ -42,33 +37,15 @@ public class SettingsSecurityActivity extends BaseActivity {
ActivitySettingsSecurityBinding.inflate(getLayoutInflater()); ActivitySettingsSecurityBinding.inflate(getLayoutInflater());
setContentView(activitySettingsSecurityBinding.getRoot()); setContentView(activitySettingsSecurityBinding.getRoot());
ImageView closeActivity = activitySettingsSecurityBinding.close; activitySettingsSecurityBinding.topAppBar.setNavigationOnClickListener(v -> finish());
initCloseListener();
closeActivity.setOnClickListener(onClickListener);
TextView cacheSizeDataSelected =
activitySettingsSecurityBinding.cacheSizeDataSelected; // setter for data cache size
TextView cacheSizeImagesSelected =
activitySettingsSecurityBinding
.cacheSizeImagesSelected; // setter for images cache size
TextView clearCacheSelected =
activitySettingsSecurityBinding.clearCacheSelected; // setter for clear cache
LinearLayout certsFrame = activitySettingsSecurityBinding.certsFrame;
LinearLayout cacheSizeDataFrame =
activitySettingsSecurityBinding.cacheSizeDataSelectionFrame;
LinearLayout cacheSizeImagesFrame =
activitySettingsSecurityBinding.cacheSizeImagesSelectionFrame;
LinearLayout clearCacheFrame = activitySettingsSecurityBinding.clearCacheSelectionFrame;
cacheSizeDataList = getResources().getStringArray(R.array.cacheSizeList); cacheSizeDataList = getResources().getStringArray(R.array.cacheSizeList);
cacheSizeImagesList = getResources().getStringArray(R.array.cacheSizeList); cacheSizeImagesList = getResources().getStringArray(R.array.cacheSizeList);
cacheSizeDataSelected.setText( activitySettingsSecurityBinding.cacheSizeDataSelected.setText(
tinyDB.getString( tinyDB.getString(
"cacheSizeStr", getString(R.string.cacheSizeDataSelectionSelectedText))); "cacheSizeStr", getString(R.string.cacheSizeDataSelectionSelectedText)));
cacheSizeImagesSelected.setText( activitySettingsSecurityBinding.cacheSizeImagesSelected.setText(
tinyDB.getString( tinyDB.getString(
"cacheSizeImagesStr", "cacheSizeImagesStr",
getString(R.string.cacheSizeImagesSelectionSelectedText))); getString(R.string.cacheSizeImagesSelectionSelectedText)));
@ -154,11 +131,11 @@ public class SettingsSecurityActivity extends BaseActivity {
// clear cache setter // clear cache setter
File cacheDir = appCtx.getCacheDir(); File cacheDir = appCtx.getCacheDir();
clearCacheSelected.setText( activitySettingsSecurityBinding.clearCacheSelected.setText(
FileUtils.byteCountToDisplaySize((int) FileUtils.sizeOfDirectory(cacheDir))); FileUtils.byteCountToDisplaySize((int) FileUtils.sizeOfDirectory(cacheDir)));
// clear cache // clear cache
clearCacheFrame.setOnClickListener( activitySettingsSecurityBinding.clearCacheSelectionFrame.setOnClickListener(
v1 -> { v1 -> {
MaterialAlertDialogBuilder materialAlertDialogBuilder = MaterialAlertDialogBuilder materialAlertDialogBuilder =
new MaterialAlertDialogBuilder(ctx) new MaterialAlertDialogBuilder(ctx)
@ -188,7 +165,7 @@ public class SettingsSecurityActivity extends BaseActivity {
}); });
// cache size images selection dialog // cache size images selection dialog
cacheSizeImagesFrame.setOnClickListener( activitySettingsSecurityBinding.cacheSizeImagesSelectionFrame.setOnClickListener(
view -> { view -> {
MaterialAlertDialogBuilder materialAlertDialogBuilder = MaterialAlertDialogBuilder materialAlertDialogBuilder =
new MaterialAlertDialogBuilder(ctx) new MaterialAlertDialogBuilder(ctx)
@ -199,7 +176,8 @@ public class SettingsSecurityActivity extends BaseActivity {
cacheSizeImagesSelectedChoice, cacheSizeImagesSelectedChoice,
(dialogInterfaceTheme, i) -> { (dialogInterfaceTheme, i) -> {
cacheSizeImagesSelectedChoice = i; cacheSizeImagesSelectedChoice = i;
cacheSizeImagesSelected.setText( activitySettingsSecurityBinding
.cacheSizeImagesSelected.setText(
cacheSizeImagesList[i]); cacheSizeImagesList[i]);
tinyDB.putString( tinyDB.putString(
"cacheSizeImagesStr", "cacheSizeImagesStr",
@ -217,7 +195,7 @@ public class SettingsSecurityActivity extends BaseActivity {
}); });
// cache size data selection dialog // cache size data selection dialog
cacheSizeDataFrame.setOnClickListener( activitySettingsSecurityBinding.cacheSizeDataSelectionFrame.setOnClickListener(
view -> { view -> {
MaterialAlertDialogBuilder materialAlertDialogBuilder = MaterialAlertDialogBuilder materialAlertDialogBuilder =
new MaterialAlertDialogBuilder(ctx) new MaterialAlertDialogBuilder(ctx)
@ -228,7 +206,9 @@ public class SettingsSecurityActivity extends BaseActivity {
cacheSizeDataSelectedChoice, cacheSizeDataSelectedChoice,
(dialogInterfaceTheme, i) -> { (dialogInterfaceTheme, i) -> {
cacheSizeDataSelectedChoice = i; cacheSizeDataSelectedChoice = i;
cacheSizeDataSelected.setText(cacheSizeDataList[i]); activitySettingsSecurityBinding
.cacheSizeDataSelected.setText(
cacheSizeDataList[i]);
tinyDB.putString( tinyDB.putString(
"cacheSizeStr", cacheSizeDataList[i]); "cacheSizeStr", cacheSizeDataList[i]);
tinyDB.putInt("cacheSizeId", i); tinyDB.putInt("cacheSizeId", i);
@ -244,7 +224,7 @@ public class SettingsSecurityActivity extends BaseActivity {
}); });
// certs deletion // certs deletion
certsFrame.setOnClickListener( activitySettingsSecurityBinding.certsFrame.setOnClickListener(
v1 -> { v1 -> {
MaterialAlertDialogBuilder materialAlertDialogBuilder = MaterialAlertDialogBuilder materialAlertDialogBuilder =
new MaterialAlertDialogBuilder(ctx) new MaterialAlertDialogBuilder(ctx)
@ -271,9 +251,4 @@ public class SettingsSecurityActivity extends BaseActivity {
materialAlertDialogBuilder.create().show(); materialAlertDialogBuilder.create().show();
}); });
} }
private void initCloseListener() {
onClickListener = view -> finish();
}
} }

1
app/src/main/res/layout/activity_add_new_account.xml
View file

@ -17,6 +17,7 @@
style="?attr/collapsingToolbarLayoutLargeStyle" style="?attr/collapsingToolbarLayoutLargeStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap" app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
android:background="?attr/primaryBackgroundColor"
app:contentScrim="?attr/primaryBackgroundColor" app:contentScrim="?attr/primaryBackgroundColor"
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"> android:layout_height="?attr/collapsingToolbarLayoutLargeSize">

1
app/src/main/res/layout/activity_create_issue.xml
View file

@ -17,6 +17,7 @@
style="?attr/collapsingToolbarLayoutLargeStyle" style="?attr/collapsingToolbarLayoutLargeStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap" app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
android:background="?attr/primaryBackgroundColor"
app:contentScrim="?attr/primaryBackgroundColor" app:contentScrim="?attr/primaryBackgroundColor"
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"> android:layout_height="?attr/collapsingToolbarLayoutLargeSize">

5
app/src/main/res/layout/activity_create_label.xml
View file

@ -17,6 +17,7 @@
style="?attr/collapsingToolbarLayoutLargeStyle" style="?attr/collapsingToolbarLayoutLargeStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap" app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
android:background="?attr/primaryBackgroundColor"
app:contentScrim="?attr/primaryBackgroundColor" app:contentScrim="?attr/primaryBackgroundColor"
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"> android:layout_height="?attr/collapsingToolbarLayoutLargeSize">
@ -72,7 +73,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dimen32dp" android:layout_height="@dimen/dimen32dp"
android:layout_marginTop="@dimen/dimen16dp" android:layout_marginTop="@dimen/dimen32dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
@ -88,7 +89,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
style="?attr/materialCardViewElevatedStyle" style="?attr/materialCardViewElevatedStyle"
android:layout_width="@dimen/dimen60dp" android:layout_width="@dimen/dimen48dp"
android:layout_height="@dimen/dimen28dp" android:layout_height="@dimen/dimen28dp"
app:cardCornerRadius="@dimen/dimen16dp" app:cardCornerRadius="@dimen/dimen16dp"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">

1
app/src/main/res/layout/activity_create_milestone.xml
View file

@ -17,6 +17,7 @@
style="?attr/collapsingToolbarLayoutLargeStyle" style="?attr/collapsingToolbarLayoutLargeStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap" app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
android:background="?attr/primaryBackgroundColor"
app:contentScrim="?attr/primaryBackgroundColor" app:contentScrim="?attr/primaryBackgroundColor"
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"> android:layout_height="?attr/collapsingToolbarLayoutLargeSize">

1
app/src/main/res/layout/activity_create_pr.xml
View file

@ -17,6 +17,7 @@
style="?attr/collapsingToolbarLayoutLargeStyle" style="?attr/collapsingToolbarLayoutLargeStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap" app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
android:background="?attr/primaryBackgroundColor"
app:contentScrim="?attr/primaryBackgroundColor" app:contentScrim="?attr/primaryBackgroundColor"
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"> android:layout_height="?attr/collapsingToolbarLayoutLargeSize">

1
app/src/main/res/layout/activity_create_repo.xml
View file

@ -17,6 +17,7 @@
style="?attr/collapsingToolbarLayoutLargeStyle" style="?attr/collapsingToolbarLayoutLargeStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap" app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
android:background="?attr/primaryBackgroundColor"
app:contentScrim="?attr/primaryBackgroundColor" app:contentScrim="?attr/primaryBackgroundColor"
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"> android:layout_height="?attr/collapsingToolbarLayoutLargeSize">

223
app/src/main/res/layout/activity_settings_code_editor.xml
View file

@ -1,150 +1,133 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/primaryBackgroundColor" 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">
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar" android:id="@+id/appBarLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dimen10dp" android:background="?attr/primaryBackgroundColor"
android:theme="@style/Widget.AppCompat.SearchView" android:fitsSystemWindows="true">
app:elevation="@dimen/dimen0dp">
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/toolbar" style="?attr/collapsingToolbarLayoutLargeStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
android:background="?attr/primaryBackgroundColor" android:background="?attr/primaryBackgroundColor"
android:theme="@style/AppTheme.AppBarOverlay"> app:contentScrim="?attr/primaryBackgroundColor"
android:layout_height="?attr/collapsingToolbarLayoutLargeSize">
<ImageView <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/close" android:id="@+id/topAppBar"
android:layout_width="@dimen/dimen26dp" android:layout_width="match_parent"
android:layout_height="@dimen/dimen26dp" android:elevation="0dp"
android:layout_marginStart="@dimen/dimen16dp" android:layout_height="?attr/actionBarSize"
android:layout_marginEnd="@dimen/dimen16dp" app:title="@string/codeEditor"
android:background="?android:attr/selectableItemBackgroundBorderless" app:layout_collapseMode="pin"
android:clickable="true" app:navigationIcon="@drawable/ic_close" />
android:contentDescription="@string/close"
android:focusable="true"
android:gravity="center_vertical"
android:src="@drawable/ic_close"/>
<TextView </com.google.android.material.appbar.CollapsingToolbarLayout>
android:id="@+id/toolbar_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:maxLines="1"
android:text="@string/codeEditor"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen20sp"/>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<LinearLayout <androidx.core.widget.NestedScrollView
android:id="@+id/ceColorSelectionFrame"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginBottom="@dimen/dimen6dp" app:layout_behavior="@string/appbar_scrolling_view_behavior">
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:orientation="vertical"
android:padding="@dimen/dimen16dp">
<TextView <LinearLayout
android:id="@+id/ceColorHeaderSelector" android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen24dp" android:orientation="vertical"
android:layout_marginEnd="@dimen/dimen24dp" android:padding="@dimen/dimen16dp">
android:text="@string/ceSyntaxHighlightColor"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen18sp"/>
<TextView <LinearLayout
android:id="@+id/ceColorSelected" android:id="@+id/ceColorSelectionFrame"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen24dp" android:clickable="true"
android:layout_marginEnd="@dimen/dimen24dp" android:focusable="true"
android:text="@string/themeSelectionSelectedText" android:layout_marginTop="@dimen/dimen8dp"
android:textColor="?attr/selectedTextColor" android:orientation="vertical">
android:textSize="@dimen/dimen16sp"/>
</LinearLayout> <TextView
android:id="@+id/ceColorHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ceSyntaxHighlightColor"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen18sp"/>
<LinearLayout <TextView
android:id="@+id/indentationSelectionFrame" android:id="@+id/ceColorSelected"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dimen6dp" android:text="@string/themeSelectionSelectedText"
android:background="?android:attr/selectableItemBackground" android:textColor="?attr/selectedTextColor"
android:clickable="true" android:textSize="@dimen/dimen16sp" />
android:focusable="true"
android:orientation="vertical"
android:padding="@dimen/dimen16dp">
<TextView </LinearLayout>
android:id="@+id/indentationHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/ceIndentation"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen18sp"/>
<TextView <LinearLayout
android:id="@+id/indentationSelected" android:id="@+id/indentationSelectionFrame"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen24dp" android:layout_marginTop="@dimen/dimen32dp"
android:layout_marginEnd="@dimen/dimen24dp" android:clickable="true"
android:text="@string/settingsThemeTimeSelectedHint" android:focusable="true"
android:textColor="?attr/selectedTextColor" android:orientation="vertical">
android:textSize="@dimen/dimen16sp"/>
</LinearLayout> <TextView
android:id="@+id/indentationHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ceIndentation"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen18sp" />
<LinearLayout <TextView
android:id="@+id/indentationTabsSelectionFrame" android:id="@+id/indentationSelected"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dimen6dp" android:text="@string/settingsThemeTimeSelectedHint"
android:background="?android:attr/selectableItemBackground" android:textColor="?attr/selectedTextColor"
android:clickable="true" android:textSize="@dimen/dimen16sp" />
android:focusable="true"
android:orientation="vertical"
android:padding="@dimen/dimen16dp">
<TextView </LinearLayout>
android:id="@+id/indentationTabsHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/ceIndentationTabsWidth"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen18sp"/>
<TextView <LinearLayout
android:id="@+id/indentationTabsSelected" android:id="@+id/indentationTabsSelectionFrame"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen24dp" android:layout_marginTop="@dimen/dimen32dp"
android:layout_marginEnd="@dimen/dimen24dp" android:clickable="true"
android:text="@string/settingsThemeTimeSelectedHint" android:focusable="true"
android:textColor="?attr/selectedTextColor" android:orientation="vertical">
android:textSize="@dimen/dimen16sp"/>
</LinearLayout> <TextView
android:id="@+id/indentationTabsHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ceIndentationTabsWidth"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen18sp" />
</LinearLayout> <TextView
android:id="@+id/indentationTabsSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settingsThemeTimeSelectedHint"
android:textColor="?attr/selectedTextColor"
android:textSize="@dimen/dimen16sp" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

1
app/src/main/res/layout/activity_settings_notifications.xml
View file

@ -17,6 +17,7 @@
style="?attr/collapsingToolbarLayoutLargeStyle" style="?attr/collapsingToolbarLayoutLargeStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap" app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
android:background="?attr/primaryBackgroundColor"
app:contentScrim="?attr/primaryBackgroundColor" app:contentScrim="?attr/primaryBackgroundColor"
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"> android:layout_height="?attr/collapsingToolbarLayoutLargeSize">

293
app/src/main/res/layout/activity_settings_security.xml
View file

@ -1,196 +1,169 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/primaryBackgroundColor" 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">
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar" android:id="@+id/appBarLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dimen10dp" android:background="?attr/primaryBackgroundColor"
android:theme="@style/Widget.AppCompat.SearchView" android:fitsSystemWindows="true">
app:elevation="@dimen/dimen0dp">
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/toolbar" style="?attr/collapsingToolbarLayoutLargeStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
android:background="?attr/primaryBackgroundColor"> android:background="?attr/primaryBackgroundColor"
app:contentScrim="?attr/primaryBackgroundColor"
android:layout_height="?attr/collapsingToolbarLayoutLargeSize">
<ImageView <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/close" android:id="@+id/topAppBar"
android:layout_width="@dimen/dimen26dp" android:layout_width="match_parent"
android:layout_height="@dimen/dimen26dp" android:elevation="0dp"
android:layout_marginStart="@dimen/dimen16dp" android:layout_height="?attr/actionBarSize"
android:layout_marginEnd="@dimen/dimen16dp" app:title="@string/settingsSecurityHeader"
android:background="?android:attr/selectableItemBackgroundBorderless" app:layout_collapseMode="pin"
android:clickable="true" app:navigationIcon="@drawable/ic_close" />
android:contentDescription="@string/close"
android:focusable="true"
android:gravity="center_vertical"
android:src="@drawable/ic_close"/>
<TextView </com.google.android.material.appbar.CollapsingToolbarLayout>
android:id="@+id/toolbar_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:maxLines="1"
android:text="@string/settingsSecurityHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen20sp"/>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<RelativeLayout <androidx.core.widget.NestedScrollView
android:id="@+id/biometricFrame"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginBottom="@dimen/dimen6dp" app:layout_behavior="@string/appbar_scrolling_view_behavior">
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:padding="@dimen/dimen16dp">
<TextView <LinearLayout
android:id="@+id/biometricHeader" android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen24dp" android:orientation="vertical"
android:layout_marginEnd="@dimen/dimen72dp" android:padding="@dimen/dimen16dp">
android:text="@string/settingsBiometricHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen18sp"/>
<com.google.android.material.materialswitch.MaterialSwitch <LinearLayout
android:id="@+id/switchBiometric" android:id="@+id/biometricFrame"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="@dimen/dimen24dp" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:orientation="horizontal">
android:layout_gravity="end"
android:layout_toEndOf="@+id/biometricHeader"
android:gravity="end"
android:paddingStart="@dimen/dimen0dp"
android:paddingEnd="@dimen/dimen24dp" />
</RelativeLayout> <TextView
android:id="@+id/biometricHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight=".90"
android:text="@string/settingsBiometricHeader"
android:layout_marginTop="@dimen/dimen4dp"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen18sp" />
<LinearLayout <com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/certsFrame" android:id="@+id/switchBiometric"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dimen6dp" android:contentDescription="@string/settingsBiometricHeader"
android:background="?android:attr/selectableItemBackground" android:layout_weight=".10" />
android:orientation="vertical"
android:padding="@dimen/dimen16dp">
<TextView </LinearLayout>
android:id="@+id/tvCertHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/settingsCertsSelectorHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp"/>
</LinearLayout> <LinearLayout
android:id="@+id/certsFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen32dp"
android:orientation="vertical">
<LinearLayout <TextView
android:id="@+id/cacheSizeDataSelectionFrame" android:id="@+id/tvCertHeader"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dimen6dp" android:text="@string/settingsCertsSelectorHeader"
android:background="?android:attr/selectableItemBackground" android:textColor="?attr/primaryTextColor"
android:orientation="vertical" android:textSize="18sp" />
android:padding="@dimen/dimen16dp">
<TextView </LinearLayout>
android:id="@+id/cacheSizeDataHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/cacheSizeDataSelectionHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen18sp"/>
<TextView <LinearLayout
android:id="@+id/cacheSizeDataSelected" android:id="@+id/cacheSizeDataSelectionFrame"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen24dp" android:layout_marginTop="@dimen/dimen32dp"
android:layout_marginEnd="@dimen/dimen24dp" android:orientation="vertical">
android:text="@string/cacheSizeDataSelectionSelectedText"
android:textColor="?attr/selectedTextColor"
android:textSize="@dimen/dimen16sp"/>
</LinearLayout> <TextView
android:id="@+id/cacheSizeDataHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cacheSizeDataSelectionHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen18sp" />
<LinearLayout <TextView
android:id="@+id/cacheSizeImagesSelectionFrame" android:id="@+id/cacheSizeDataSelected"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dimen6dp" android:text="@string/cacheSizeDataSelectionSelectedText"
android:background="?android:attr/selectableItemBackground" android:textColor="?attr/selectedTextColor"
android:orientation="vertical" android:textSize="@dimen/dimen16sp" />
android:padding="@dimen/dimen16dp">
<TextView </LinearLayout>
android:id="@+id/cacheSizeImagesHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/cacheSizeImagesSelectionHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen18sp"/>
<TextView <LinearLayout
android:id="@+id/cacheSizeImagesSelected" android:id="@+id/cacheSizeImagesSelectionFrame"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen24dp" android:layout_marginTop="@dimen/dimen32dp"
android:layout_marginEnd="@dimen/dimen24dp" android:orientation="vertical">
android:text="@string/cacheSizeImagesSelectionSelectedText"
android:textColor="?attr/selectedTextColor"
android:textSize="@dimen/dimen16sp"/>
</LinearLayout> <TextView
android:id="@+id/cacheSizeImagesHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cacheSizeImagesSelectionHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen18sp" />
<LinearLayout <TextView
android:id="@+id/clearCacheSelectionFrame" android:id="@+id/cacheSizeImagesSelected"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dimen6dp" android:text="@string/cacheSizeImagesSelectionSelectedText"
android:background="?android:attr/selectableItemBackground" android:textColor="?attr/selectedTextColor"
android:orientation="vertical" android:textSize="@dimen/dimen16sp" />
android:padding="@dimen/dimen16dp">
<TextView </LinearLayout>
android:id="@+id/clearCacheHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/clearCacheSelectionHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen18sp"/>
<TextView <LinearLayout
android:id="@+id/clearCacheSelected" android:id="@+id/clearCacheSelectionFrame"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen24dp" android:layout_marginTop="@dimen/dimen32dp"
android:layout_marginEnd="@dimen/dimen24dp" android:orientation="vertical">
android:text="@string/clearCacheSelectionSelectedText"
android:textColor="?attr/selectedTextColor"
android:textSize="@dimen/dimen16sp"/>
</LinearLayout> <TextView
android:id="@+id/clearCacheHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/clearCacheSelectionHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen18sp" />
</LinearLayout> <TextView
android:id="@+id/clearCacheSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/clearCacheSelectionSelectedText"
android:textColor="?attr/selectedTextColor"
android:textSize="@dimen/dimen16sp" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>