use inter for readability

plus, jb mono in terminal

and some cleanup

Signed-off-by: androidacy-user <opensource@androidacy.com>
pull/299/head
androidacy-user 1 year ago
parent 10f5657e74
commit babc002422

@ -12,6 +12,7 @@ import android.content.res.Resources;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
import android.webkit.CookieManager;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.ActionBar;
@ -33,9 +34,7 @@ import org.apache.commons.io.FileUtils;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.HashSet;
import java.util.Objects; import java.util.Objects;
import java.util.Set;
import io.realm.Realm; import io.realm.Realm;
import io.realm.RealmConfiguration; import io.realm.RealmConfiguration;
@ -356,14 +355,8 @@ public class SetupActivity extends FoxActivity implements LanguageActivity {
} }
public void createFiles() { public void createFiles() {
// create cookie prefs // use cookiemanager to create the cookie database
SharedPreferences cookiePrefs = MainApplication.getPreferences("cookies"); CookieManager.getInstance();
// add is_foxmmm cookie to the universal cookie stringset
Set<String> universalCookies = cookiePrefs.getStringSet("universal", new HashSet<>());
// silence the warning by copying the set to a new set
Set<String> universalCookies2 = new HashSet<>(universalCookies);
universalCookies2.add("is_foxmmm=true");
cookiePrefs.edit().putStringSet("universal", universalCookies2).apply();
// we literally only use these to create the http cache folders // we literally only use these to create the http cache folders
try { try {
FileUtils.forceMkdir(new File(MainApplication.getINSTANCE().getDataDir() + "/cache/cronet")); FileUtils.forceMkdir(new File(MainApplication.getINSTANCE().getDataDir() + "/cache/cronet"));

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:targetApi="o">
<!-- variants for inter font -->
<font
android:font="@font/interregular"
android:fontStyle="normal"
android:fontWeight="400" />
<font
android:font="@font/interitalic"
android:fontStyle="italic"
android:fontWeight="400" />
<font
android:font="@font/interbold"
android:fontStyle="normal"
android:fontWeight="700" />
</font-family>

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<!-- jetbrains mono font -->
<font
android:font="@font/jetbrainsmonoregular"
android:fontStyle="normal"
android:fontWeight="400"
tools:targetApi="o" />
</font-family>

@ -1,6 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> <ScrollView
<LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/crash_scroll"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<!-- layout with crash_text header and crash_details body --> <!-- layout with crash_text header and crash_details body -->
<!-- first, crash icon --> <!-- first, crash icon -->
@ -37,21 +45,25 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<HorizontalScrollView android:layout_width="match_parent" android:layout_height="wrap_content"> <HorizontalScrollView
<com.google.android.material.textview.MaterialTextView android:id="@+id/crash_details_scroll"
android:id="@+id/crash_details" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginEnd="24dp" <com.google.android.material.textview.MaterialTextView
android:fontFamily="monospace" android:id="@+id/crash_details"
android:gravity="start" android:layout_width="wrap_content"
android:minHeight="48dp" android:layout_height="wrap_content"
android:padding="12dp" android:layout_marginEnd="24dp"
android:scrollbars="vertical|horizontal" android:fontFamily="monospace"
android:scrollHorizontally="true" android:gravity="start"
android:text="@string/crash_details" android:minHeight="48dp"
android:textIsSelectable="false" android:padding="12dp"
android:textSize="16sp" /> android:scrollbars="vertical|horizontal"
android:scrollHorizontally="true"
android:text="@string/crash_details"
android:textIsSelectable="false"
android:textSize="16sp" />
</HorizontalScrollView> </HorizontalScrollView>
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
@ -72,7 +84,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<!-- feedback form header --> <!-- feedback form header -->
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/feedback_text" android:id="@+id/feedback_text"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -82,76 +94,85 @@
android:text="@string/please_feedback" android:text="@string/please_feedback"
android:textSize="18sp" /> android:textSize="18sp" />
<LinearLayout
android:id="@+id/feedback"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<!-- feedback form name -->
<EditText
android:id="@+id/feedback_name"
android:layout_width="320dp"
android:layout_height="48dp"
android:layout_margin="10dp"
android:hint="@string/feedback_name"
android:inputType="text" />
<!-- feedback form email -->
<EditText
android:id="@+id/feedback_email"
android:layout_width="320dp"
android:layout_height="48dp"
android:layout_margin="10dp"
android:hint="@string/feedback_email"
android:inputType="textEmailAddress" />
<!-- feedback form message -->
<EditText
android:id="@+id/feedback_message"
android:layout_width="320dp"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:hint="@string/feedback_message"
android:inputType="textMultiLine" />
<!-- button group for submit feedback & restart / restart only -->
<LinearLayout <LinearLayout
android:id="@+id/feedback"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="vertical">
<!-- submit feedback button --> <!-- feedback form name -->
<com.google.android.material.button.MaterialButton <EditText
android:id="@+id/feedback_submit" android:id="@+id/feedback_name"
android:layout_width="wrap_content" android:layout_width="320dp"
android:layout_height="wrap_content" android:layout_height="48dp"
android:layout_margin="10dp" android:layout_margin="10dp"
android:text="@string/feedback_submit" /> android:hint="@string/feedback_name"
android:inputType="text" />
<!-- feedback form email -->
<EditText
android:id="@+id/feedback_email"
android:layout_width="320dp"
android:layout_height="48dp"
android:layout_margin="10dp"
android:hint="@string/feedback_email"
android:inputType="textEmailAddress" />
<!-- restart button --> <!-- feedback form message -->
<com.google.android.material.button.MaterialButton <EditText
android:id="@+id/restart" android:id="@+id/feedback_message"
android:layout_width="wrap_content" android:layout_width="320dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="10dp" android:layout_margin="10dp"
android:text="@string/restart" /> android:hint="@string/feedback_message"
android:inputType="textMultiLine" />
</LinearLayout>
<LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> <!-- button group for submit feedback & restart / restart only -->
<LinearLayout
<com.google.android.material.textview.MaterialTextView android:layout_width="match_parent" android:layout_height="match_parent" android:layout_margin="10dp" android:gravity="fill" android:text="@string/reset_warning" android:textSize="16sp" /> android:layout_width="match_parent"
android:layout_height="wrap_content"
<!-- reset app button --> android:orientation="horizontal">
<com.google.android.material.button.MaterialButton
android:id="@+id/reset" <!-- submit feedback button -->
android:layout_width="wrap_content" <com.google.android.material.button.MaterialButton
android:layout_height="wrap_content" android:id="@+id/feedback_submit"
android:layout_margin="10dp" android:layout_width="wrap_content"
android:text="@string/reset_app" /> android:layout_height="wrap_content"
android:layout_margin="10dp"
android:text="@string/feedback_submit" />
<!-- restart button -->
<com.google.android.material.button.MaterialButton
android:id="@+id/restart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:text="@string/restart" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="10dp"
android:gravity="fill"
android:text="@string/reset_warning"
android:textSize="16sp" />
<!-- reset app button -->
<com.google.android.material.button.MaterialButton
android:id="@+id/reset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:text="@string/reset_app" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

@ -4,8 +4,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root_container" android:id="@+id/root_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:paddingVertical="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingVertical="0dp"
app:fitsSystemWindowsInsets="start|end|bottom|top" app:fitsSystemWindowsInsets="start|end|bottom|top"
tools:context=".MainActivity"> tools:context=".MainActivity">
@ -22,7 +22,7 @@
android:id="@+id/blur_frame" android:id="@+id/blur_frame"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingBottom="84dp" > android:paddingBottom="84dp">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/module_list" android:id="@+id/module_list"
@ -90,10 +90,10 @@
android:layout_height="24dp" android:layout_height="24dp"
android:background="@null" android:background="@null"
android:visibility="gone" android:visibility="gone"
app:iconifiedByDefault="true"
app:layout_constraintBottom_toBottomOf="@id/bottom_navigation" app:layout_constraintBottom_toBottomOf="@id/bottom_navigation"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:iconifiedByDefault="true"
app:useDrawerArrowDrawable="true" /> app:useDrawerArrowDrawable="true" />
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>
</LinearLayout> </LinearLayout>
@ -103,8 +103,8 @@
android:id="@+id/bottom_navigation" android:id="@+id/bottom_navigation"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="visible"
android:paddingBottom="0dp" android:paddingBottom="0dp"
android:visibility="visible"
app:compatShadowEnabled="true" app:compatShadowEnabled="true"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

@ -60,7 +60,7 @@
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:layout_weight="1" android:layout_weight="1"
android:padding="12dp" android:padding="12dp"
android:text="@string/setup_theme_button" android:text="@string/theme"
android:textSize="16sp" android:textSize="16sp"
app:icon="@drawable/ic_baseline_palette_24" app:icon="@drawable/ic_baseline_palette_24"
app:iconGravity="textStart" app:iconGravity="textStart"
@ -78,7 +78,7 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_weight="1" android:layout_weight="1"
android:padding="12dp" android:padding="12dp"
android:text="@string/setup_language_button" android:text="@string/language"
android:textSize="16sp" android:textSize="16sp"
app:icon="@drawable/ic_baseline_language_24" app:icon="@drawable/ic_baseline_language_24"
app:iconGravity="textStart" app:iconGravity="textStart"

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" tools:context=".UpdateActivity"> android:orientation="vertical"
tools:context=".UpdateActivity">
<!-- Activity used to download and install app updates --> <!-- Activity used to download and install app updates -->
<!-- first, upgrade icon --> <!-- first, upgrade icon -->
<ImageView <ImageView
android:id="@+id/updat_icon" android:id="@+id/update_icon"
android:layout_width="101dp" android:layout_width="101dp"
android:layout_height="93dp" android:layout_height="93dp"
android:layout_gravity="center" android:layout_gravity="center"
@ -53,31 +53,32 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:textAppearance="?attr/textAppearanceBody2" /> android:textAppearance="?attr/textAppearanceBody2" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="4dp"
android:orientation="horizontal">
<com.google.android.material.button.MaterialButton
android:id="@+id/update_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" android:layout_gravity="bottom|end"
android:layout_marginTop="16dp" android:layout_margin="4dp"
android:text="@string/update_button" android:orientation="horizontal">
android:visibility="invisible" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/update_cancel_button" android:id="@+id/update_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="@string/update_cancel_button" android:text="@string/update_button"
android:visibility="visible" /> android:visibility="invisible" />
</LinearLayout> <com.google.android.material.button.MaterialButton
android:id="@+id/update_cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:text="@string/update_cancel_button"
android:visibility="visible" />
</LinearLayout>
<!-- Invisible warning for debug builds --> <!-- Invisible warning for debug builds -->
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
@ -97,25 +98,25 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/changelog_title" android:id="@+id/changelog_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="@string/changelog" android:text="@string/changelog"
android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall" /> android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall" />
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/update_changelog" android:id="@+id/update_changelog"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:scrollbars="vertical" android:scrollbars="vertical"
android:text="@string/changelog_none" android:text="@string/changelog_none"
android:textAppearance="?attr/textAppearanceBody2" /> android:textAppearance="?attr/textAppearanceBody2" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

@ -1,16 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginStart="8dp" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginHorizontal="8dp">
android:layout_height="wrap_content" >
<CheckBox <CheckBox
android:id="@+id/checkbox" android:id="@+id/checkbox"
style="?android:attr/smallIcon" style="?android:attr/smallIcon"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginHorizontal="16dp" />
android:layout_marginEnd="16dp"/>
</FrameLayout> </FrameLayout>

@ -21,6 +21,7 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/install_terminal" android:id="@+id/install_terminal"
android:background="@null" android:background="@null"
android:fontFamily="@font/jetbrainsmono"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:textSize="16sp" /> android:textSize="16sp" />

@ -10,6 +10,7 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/install_terminal" android:id="@+id/install_terminal"
android:fontFamily="@font/jetbrainsmono"
android:background="@null" android:background="@null"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

@ -64,6 +64,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<TextView <TextView
android:id="@+id/markdown_action_bar_padding" android:id="@+id/markdown_action_bar_padding"
android:layout_width="match_parent" android:layout_width="match_parent"

@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout 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"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginVertical="3dp" android:layout_marginVertical="3dp"
android:filterTouchesWhenObscured="true" android:filterTouchesWhenObscured="true"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="vertical" android:orientation="vertical"
tools:ignore="RtlHardcoded,RtlSymmetry"> tools:ignore="RtlHardcoded,RtlSymmetry">
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:id="@+id/card_view" android:id="@+id/card_view"
style="?attr/materialCardViewElevatedStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
style="?attr/materialCardViewElevatedStyle">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -23,44 +23,43 @@
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
app:layout_constraintTop_toTopOf="parent"
android:id="@+id/main_card_text" android:id="@+id/main_card_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:padding="6dp"> android:padding="6dp"
app:layout_constraintTop_toTopOf="parent">
<!-- Module components --> <!-- Module components -->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:gravity="center_vertical"
android:gravity="center_vertical"> android:orientation="horizontal">
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/invalid_module_props" android:id="@+id/invalid_module_props"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_marginEnd="4dp"
android:text="@string/low_quality_module" android:text="@string/low_quality_module"
android:textSize="12sp" android:textSize="12sp"
android:layout_marginEnd="4dp"
android:visibility="gone" android:visibility="gone"
app:chipStartPadding="4dp"
app:chipEndPadding="2dp" app:chipEndPadding="2dp"
app:chipIcon="@drawable/ic_baseline_error_24"
app:chipIconSize="15dp" app:chipIconSize="15dp"
app:chipIcon="@drawable/ic_baseline_error_24" /> app:chipStartPadding="4dp" />
<TextView <TextView
android:id="@+id/title_text" android:id="@+id/title_text"
android:paddingStart="2dp"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:maxLines="2" android:maxLines="2"
android:paddingStart="2dp"
android:text="@string/loading" android:text="@string/loading"
android:textSize="16sp"
android:textAppearance="?attr/textAppearanceTitleMedium" android:textAppearance="?attr/textAppearanceTitleMedium"
/> android:textSize="16sp" />
<com.google.android.material.materialswitch.MaterialSwitch <com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/switch_action" android:id="@+id/switch_action"
@ -82,61 +81,60 @@
<TextView <TextView
android:id="@+id/credit_text" android:id="@+id/credit_text"
android:paddingStart="2dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="2dp"
android:text="@string/loading" android:text="@string/loading"
android:textSize="12sp"
android:textAppearance="?attr/textAppearanceBodyMedium" android:textAppearance="?attr/textAppearanceBodyMedium"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
/> android:textSize="12sp" />
<TextView <TextView
android:id="@+id/description_text" android:id="@+id/description_text"
android:paddingStart="2dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:paddingStart="2dp"
android:text="@string/loading" android:text="@string/loading"
android:textSize="16sp"
android:textAppearance="?attr/textAppearanceBodyMedium" android:textAppearance="?attr/textAppearanceBodyMedium"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
/> android:textSize="16sp" />
<TextView <TextView
android:id="@+id/updated_text" android:id="@+id/updated_text"
android:paddingStart="2dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:paddingStart="2dp"
android:text="@string/loading" android:text="@string/loading"
android:textSize="12sp" /> android:textSize="12sp" />
</LinearLayout> </LinearLayout>
<TextView <TextView
app:layout_constraintTop_toBottomOf="@id/main_card_text" android:id="@+id/module_layout_helper"
android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/module_layout_helper" android:orientation="vertical"
android:orientation="vertical"> android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/main_card_text">
</TextView> </TextView>
<!-- Buttons --> <!-- Buttons -->
<HorizontalScrollView <HorizontalScrollView
app:layout_constraintBottom_toBottomOf="@id/module_layout_helper"
android:visibility="gone"
android:id="@+id/module_options_holder" android:id="@+id/module_options_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scrollbars="none"> android:scrollbars="none"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/module_layout_helper">
<com.google.android.material.chip.ChipGroup <com.google.android.material.chip.ChipGroup
android:animateLayoutChanges="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
android:animateLayoutChanges="true"
android:paddingHorizontal="4dp" android:paddingHorizontal="4dp"
app:singleLine="true"> app:singleLine="true">

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<TextView <TextView
android:id="@+id/textView" android:id="@+id/textView"

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?><!-- Shamelessly stolen from https://github.com/NeoApplications/Neo-Wellbeing/blob/master/app/src/main/res/layout/preference_material_switch.xml -->
<!-- Shamelessly stolen from https://github.com/NeoApplications/Neo-Wellbeing/blob/master/app/src/main/res/layout/preference_material_switch.xml -->
<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android" <com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/switchWidget" android:id="@+id/switchWidget"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@null"
android:clickable="false" android:clickable="false"
android:focusable="false" /> android:focusable="false" />

@ -1,5 +1,4 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
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:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:orientation="vertical">
</LinearLayout>

@ -29,6 +29,8 @@
<item name="colorBackgroundFloating">@color/light_colorBackgroundFloating</item> <item name="colorBackgroundFloating">@color/light_colorBackgroundFloating</item>
<item name="backgroundColor">@color/light_backgroundColor</item> <item name="backgroundColor">@color/light_backgroundColor</item>
<item name="chipStyle">@style/Widget.Material3.Chip.Choice.Light</item> <item name="chipStyle">@style/Widget.Material3.Chip.Choice.Light</item>
<!-- fonts -->
<item name="android:fontFamily">@font/inter</item>
</style> </style>
<style name="Widget.Material3.Chip.Choice.Light" parent="Widget.Material3.Chip.Assist"> <style name="Widget.Material3.Chip.Choice.Light" parent="Widget.Material3.Chip.Assist">
@ -55,6 +57,8 @@
<!-- Action bar --> <!-- Action bar -->
<item name="actionBarStyle">@style/Widget.Material3.ActionBar.Solid</item> <item name="actionBarStyle">@style/Widget.Material3.ActionBar.Solid</item>
<item name="chipStyle">@style/Widget.Material3.Chip.Choice.Light</item> <item name="chipStyle">@style/Widget.Material3.Chip.Choice.Light</item>
<!-- fonts -->
<item name="android:fontFamily">@font/inter</item>
</style> </style>
<style name="Theme.MagiskModuleManager.Dark" parent="Theme.Material3.Dark"> <style name="Theme.MagiskModuleManager.Dark" parent="Theme.Material3.Dark">
<item name="android:isLightTheme" <item name="android:isLightTheme"
@ -85,7 +89,8 @@
<item name="dialogCornerRadius">@dimen/card_corner_radius</item> <item name="dialogCornerRadius">@dimen/card_corner_radius</item>
<item name="colorBackgroundFloating">@color/dark_colorBackgroundFloating</item> <item name="colorBackgroundFloating">@color/dark_colorBackgroundFloating</item>
<item name="backgroundColor">@color/dark_backgroundColor</item> <item name="backgroundColor">@color/dark_backgroundColor</item>
<item name="chipStyle">@style/Widget.Material.Chip.Choice.Dark</item> <!-- fonts -->
<item name="android:fontFamily">@font/inter</item>
</style> </style>
<!-- Black theme, which is just a dark theme with a black background --> <!-- Black theme, which is just a dark theme with a black background -->

Loading…
Cancel
Save