github-starred/gitnex
2
0
Fork 0
mirror of https://github.com/gitnex-org/gitnex.git synced 2026-03-11 17:34:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix layout and revamp login (#1501)

Browse Source 
Closes #1477

Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/1501
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-committed-by: M M Arif <mmarif@swatian.com>
This commit is contained in:
M M Arif
2025-06-09 07:32:51 +02:00
committed by M M Arif
parent a1dc0fb9b6
commit 4e3b6e02c2
9 changed files with 259 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/build.gradle
View File

@@ -1,5 +1,5 @@
plugins {
id "com.diffplug.spotless" version "6.25.0"
id "com.diffplug.spotless" version "7.0.3"
}
apply plugin: 'com.android.application'
@@ -60,14 +60,14 @@ configurations {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.appcompat:appcompat:1.7.1'
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.compose.material3:material3:1.3.1'
implementation 'androidx.compose.material3:material3-window-size-class:1.3.1'
implementation 'androidx.compose.material3:material3:1.3.2'
implementation 'androidx.compose.material3:material3-window-size-class:1.3.2'
implementation 'androidx.viewpager2:viewpager2:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
implementation "androidx.legacy:legacy-support-v4:1.0.0"
implementation "androidx.lifecycle:lifecycle-viewmodel:2.8.7"
implementation "androidx.lifecycle:lifecycle-viewmodel:2.9.1"
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
@@ -98,7 +98,7 @@ dependencies {
annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0'
implementation "com.caverock:androidsvg-aar:1.4"
implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.29"
implementation 'com.google.guava:guava:32.1.3-jre'
implementation 'com.google.guava:guava:33.3.1-jre'
//noinspection GradleDependency
implementation 'commons-io:commons-io:2.5'
implementation 'org.apache.commons:commons-lang3:3.13.0'
@@ -106,13 +106,13 @@ dependencies {
implementation 'ch.acra:acra-mail:5.11.3'
implementation 'ch.acra:acra-limiter:5.11.3'
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.10.0"
implementation 'androidx.room:room-runtime:2.7.1'
annotationProcessor 'androidx.room:room-compiler:2.7.1'
implementation "androidx.work:work-runtime:2.10.1"
implementation "io.mikael:urlbuilder:2.0.9"
implementation "org.codeberg.gitnex-garage:emoji-java:v5.1.2"
//noinspection GradleDependency
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.1.5"
implementation 'androidx.biometric:biometric:1.1.0'
implementation 'com.github.chrisvest:stormpot:2.4.2'
implementation 'androidx.browser:browser:1.8.0'
@@ -136,7 +136,7 @@ spotless {
removeUnusedImports()
googleJavaFormat().aosp()
indentWithTabs()
leadingSpacesToTabs()
formatAnnotations()
}
}

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

@@ -69,7 +69,7 @@ public class LoginActivity extends BaseActivity {
NetworkStatusObserver networkStatusObserver = NetworkStatusObserver.getInstance(ctx);
// activityLoginBinding.appVersion.setText(AppUtil.getAppVersion(appCtx));
activityLoginBinding.appVersion.setText(AppUtil.getAppVersion(appCtx));
ArrayAdapter<Protocol> adapterProtocols =
new ArrayAdapter<>(

6
app/src/main/java/org/mian/gitnex/core/MainGrammarLocator.java
View File

@@ -67,9 +67,9 @@ public class MainGrammarLocator {
case "md":
return "markdown";
// case "xml":
// case "html":
// case "htm":
// case "xml":
// case "html":
// case "htm":
case "mathml":
case "svg":
return "markup";

2
app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/GoLanguage.java
View File

@@ -144,7 +144,7 @@ public class GoLanguage extends Language {
return PATTERN_TODO_COMMENT;
case GENERIC:
// TODO supported by Go 1.18
// TODO supported by Go 1.18
case ANNOTATION:
default:
return null;

2
app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/PhpLanguage.java
View File

@@ -65,7 +65,7 @@ public class PhpLanguage extends Language {
case TODO_COMMENT:
return PATTERN_TODO_COMMENT;
case ANNOTATION:
// TODO supported by PHP
// TODO supported by PHP
case GENERIC:
default:
return null;

350
app/src/main/res/layout/activity_login.xml
View File

@@ -1,188 +1,200 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/login_bg">
android:layout_height="match_parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPrimary"
android:alpha="0.6" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center"
android:layout_above="@id/card_view">
<com.google.android.material.card.MaterialCardView
style="?attr/materialCardViewFilledStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:baselineAligned="false"
app:cardCornerRadius="@dimen/dimen16dp">
<ImageView
android:id="@+id/appLogo"
android:layout_width="@dimen/dimen72dp"
android:layout_height="@dimen/dimen72dp"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:contentDescription="@string/appName"
android:src="@drawable/gitnex" />
</com.google.android.material.card.MaterialCardView>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/appName"
android:textSize="@dimen/dimen24sp"
android:textColor="@color/colorWhite"
android:layout_marginTop="@dimen/dimen8dp" />
<TextView
android:id="@+id/appVersion"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen6dp"
android:textColor="@color/colorWhite"
android:textSize="@dimen/dimen12sp" />
</LinearLayout>
<com.google.android.material.card.MaterialCardView
android:id="@+id/card_view"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/bottom_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="-28dp"
android:alpha="0.9"
app:cardCornerRadius="@dimen/dimen32dp"
app:strokeWidth="@dimen/dimen0dp">
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:layout_gravity="bottom">
<LinearLayout
android:id="@+id/top_row"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/dimen28dp">
android:orientation="horizontal"
android:paddingStart="@dimen/dimen16dp"
android:paddingEnd="@dimen/dimen16dp"
android:paddingTop="@dimen/dimen16dp"
android:gravity="center_vertical"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/card_view">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/httpsSpinnerLayout"
style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/protocol"
android:textColorHint="?attr/hintColor"
app:endIconTint="?attr/iconsColor"
app:hintTextColor="?attr/hintColor">
<AutoCompleteTextView
android:id="@+id/httpsSpinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="none"
android:labelFor="@+id/httpsSpinner"
android:textColor="?attr/inputTextColor"
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/instance_urlLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/instanceUrl"
android:textColorHint="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
app:hintTextColor="?attr/hintColor"
app:startIconDrawable="@drawable/ic_link"
app:startIconTint="?attr/iconsColor"
app:helperText="@string/instanceHelperText">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/instance_url"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textUri"
android:singleLine="true"
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/hintColor"
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/loginTokenCodeLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/copyToken"
android:textColorHint="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
app:hintTextColor="?attr/hintColor"
app:startIconDrawable="@drawable/ic_lock"
app:startIconTint="?attr/iconsColor">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/loginTokenCode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/hintColor"
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/token_helper"
<com.google.android.material.card.MaterialCardView
style="?attr/materialCardViewFilledStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen16dp"
android:layout_gravity="center_horizontal"
android:textSize="@dimen/dimen14sp"
android:autoLink="web"
android:text="@string/where_to_get_token_text" />
app:cardCornerRadius="@dimen/dimen20dp">
<com.google.android.material.button.MaterialButton
android:id="@+id/login_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:text="@string/btnLogin"
android:textColor="?attr/materialCardBackgroundColor"
android:letterSpacing="0.1"
android:textStyle="bold" />
<ImageView
android:id="@+id/appLogo"
android:layout_width="@dimen/dimen72dp"
android:layout_height="@dimen/dimen72dp"
android:contentDescription="@string/appName"
android:src="@drawable/gitnex" />
<TextView
android:id="@+id/restore_from_backup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/restoreFromBackup"
android:textSize="@dimen/dimen14sp"
android:textColor="?attr/inputTextColor"
android:gravity="center"
android:layout_marginBottom="@dimen/dimen16dp"
android:layout_marginTop="@dimen/dimen8dp" />
</com.google.android.material.card.MaterialCardView>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<!-- Form card -->
<com.google.android.material.card.MaterialCardView
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dimen16dp"
app:cardCornerRadius="@dimen/dimen32dp"
app:cardElevation="@dimen/dimen0dp"
app:strokeWidth="@dimen/dimen0dp"
app:layout_constraintTop_toBottomOf="@id/top_row"
app:layout_constraintBottom_toBottomOf="parent">
</RelativeLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/dimen28dp">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/httpsSpinnerLayout"
style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/protocol"
android:textColorHint="?attr/hintColor"
app:endIconTint="?attr/iconsColor"
app:hintTextColor="?attr/hintColor">
<AutoCompleteTextView
android:id="@+id/httpsSpinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="none"
android:labelFor="@+id/httpsSpinner"
android:textColor="?attr/inputTextColor"
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/instance_urlLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/instanceUrl"
android:textColorHint="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
app:hintTextColor="?attr/hintColor"
app:startIconDrawable="@drawable/ic_link"
app:startIconTint="?attr/iconsColor"
app:helperText="@string/instanceHelperText">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/instance_url"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textUri"
android:singleLine="true"
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/hintColor"
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/loginTokenCodeLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/copyToken"
android:textColorHint="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
app:hintTextColor="?attr/hintColor"
app:startIconDrawable="@drawable/ic_lock"
app:startIconTint="?attr/iconsColor">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/loginTokenCode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/hintColor"
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/token_helper"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen16dp"
android:layout_gravity="center_horizontal"
android:textSize="@dimen/dimen14sp"
android:autoLink="web"
android:text="@string/where_to_get_token_text" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp">
<com.google.android.material.button.MaterialButton
android:id="@+id/restore_from_backup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/restoreFromBackup"
android:textColor="?attr/materialCardBackgroundColor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.button.MaterialButton
android:id="@+id/login_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/btnLogin"
android:textColor="?attr/materialCardBackgroundColor"
android:letterSpacing="0.1"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/appVersion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:textColor="@color/colorWhite"
android:textSize="@dimen/dimen12sp"
android:gravity="center" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</com.google.android.material.card.MaterialCardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

74
app/src/main/res/layout/activity_settings_appearance.xml
View File

@@ -189,11 +189,10 @@
<TextView
android:id="@+id/tvCounterBadgeHeader"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".90"
android:layout_weight="1"
android:text="@string/settingsCounterBadges"
android:layout_marginTop="@dimen/dimen4dp"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen18sp" />
@@ -201,8 +200,7 @@
android:id="@+id/switchCounterBadge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/settingsCounterBadges"
android:layout_weight=".10" />
android:contentDescription="@string/settingsCounterBadges" />
</LinearLayout>
@@ -213,29 +211,33 @@
android:layout_marginTop="@dimen/dimen32dp"
android:orientation="vertical">
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_height="wrap_content">
<TextView
android:id="@+id/tvLabelsInListHeader"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".90"
android:paddingEnd="@dimen/dimen16dp"
android:paddingStart="@dimen/dimen0dp"
android:text="@string/settingsLabelsInListHeader"
android:layout_marginTop="@dimen/dimen4dp"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen18sp" />
android:textSize="@dimen/dimen18sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/switchLabelsInListBadge"
app:layout_constraintBaseline_toBaselineOf="@id/switchLabelsInListBadge"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/switchLabelsInListBadge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/settingsLabelsInListHeader"
android:layout_weight=".10" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
@@ -261,29 +263,33 @@
android:layout_marginTop="@dimen/dimen32dp"
android:orientation="vertical">
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_height="wrap_content">
<TextView
android:id="@+id/tvHideEmailLangInProfileHeader"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".90"
android:paddingEnd="@dimen/dimen16dp"
android:paddingStart="@dimen/dimen0dp"
android:text="@string/hideEmailLangInProfileHeader"
android:layout_marginTop="@dimen/dimen4dp"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen18sp" />
android:textSize="@dimen/dimen18sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/switchHideEmailLangInProfile"
app:layout_constraintBaseline_toBaselineOf="@id/switchHideEmailLangInProfile"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/switchHideEmailLangInProfile"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/hideEmailLangInProfileHeader"
android:layout_weight=".10" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
@@ -309,29 +315,33 @@
android:layout_marginTop="@dimen/dimen32dp"
android:orientation="vertical">
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_height="wrap_content">
<TextView
android:id="@+id/tvHideEmailNavDrawerHeader"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".90"
android:paddingEnd="@dimen/dimen16dp"
android:paddingStart="@dimen/dimen0dp"
android:text="@string/hideEmailNavDrawerHeader"
android:layout_marginTop="@dimen/dimen4dp"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen18sp" />
android:textSize="@dimen/dimen18sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/switchHideEmailNavDrawer"
app:layout_constraintBaseline_toBaselineOf="@id/switchHideEmailNavDrawer"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/switchHideEmailNavDrawer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/hideEmailNavDrawerHeader"
android:layout_weight=".10" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"

29
app/src/main/res/layout/custom_about_dialog.xml
View File

@@ -128,11 +128,10 @@
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/donationLinkPatreon"
android:layout_width="@dimen/dimen0dp"
android:layout_width="match_parent"
android:layout_height="@dimen/dimen60dp"
android:layout_marginEnd="@dimen/dimen4dp"
android:layout_marginStart="@dimen/dimen0dp"
android:layout_weight=".5"
android:layout_marginStart="@dimen/dimen4dp"
android:stateListAnimator="@null"
android:text="@string/supportTextPatreon"
android:textStyle="bold"
@@ -144,7 +143,7 @@
</LinearLayout>
<!-- translate/website text -->
<!-- translate text -->
<LinearLayout
android:id="@+id/layout_frame_2"
android:layout_width="match_parent"
@@ -154,11 +153,10 @@
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/translateLink"
android:layout_width="@dimen/dimen0dp"
android:layout_width="match_parent"
android:layout_height="@dimen/dimen60dp"
android:layout_marginEnd="@dimen/dimen4dp"
android:layout_marginStart="@dimen/dimen0dp"
android:layout_weight=".5"
android:layout_marginStart="@dimen/dimen4dp"
android:stateListAnimator="@null"
android:text="@string/translateWithCrowdin"
android:textStyle="bold"
@@ -168,13 +166,22 @@
android:backgroundTint="?attr/fabColor"
app:icon="@drawable/ic_language" />
</LinearLayout>
<!-- website text -->
<LinearLayout
android:id="@+id/layout_frame_4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen12dp"
android:orientation="horizontal">
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/appWebsite"
android:layout_width="@dimen/dimen0dp"
android:layout_width="match_parent"
android:layout_height="@dimen/dimen60dp"
android:layout_marginEnd="@dimen/dimen0dp"
android:layout_marginStart="@dimen/dimen6dp"
android:layout_weight=".5"
android:layout_marginEnd="@dimen/dimen4dp"
android:layout_marginStart="@dimen/dimen4dp"
android:stateListAnimator="@null"
android:text="@string/websiteText"
android:textStyle="bold"