diff --git a/app/src/main/java/com/fox2code/mmm/SetupActivity.java b/app/src/main/java/com/fox2code/mmm/SetupActivity.java index b95cdec..334b5e4 100644 --- a/app/src/main/java/com/fox2code/mmm/SetupActivity.java +++ b/app/src/main/java/com/fox2code/mmm/SetupActivity.java @@ -12,6 +12,7 @@ import android.content.res.Resources; import android.os.Bundle; import android.view.View; import android.view.WindowManager; +import android.webkit.CookieManager; import androidx.annotation.NonNull; import androidx.appcompat.app.ActionBar; @@ -33,9 +34,7 @@ import org.apache.commons.io.FileUtils; import java.io.File; import java.io.IOException; -import java.util.HashSet; import java.util.Objects; -import java.util.Set; import io.realm.Realm; import io.realm.RealmConfiguration; @@ -356,14 +355,8 @@ public class SetupActivity extends FoxActivity implements LanguageActivity { } public void createFiles() { - // create cookie prefs - SharedPreferences cookiePrefs = MainApplication.getPreferences("cookies"); - // add is_foxmmm cookie to the universal cookie stringset - Set universalCookies = cookiePrefs.getStringSet("universal", new HashSet<>()); - // silence the warning by copying the set to a new set - Set universalCookies2 = new HashSet<>(universalCookies); - universalCookies2.add("is_foxmmm=true"); - cookiePrefs.edit().putStringSet("universal", universalCookies2).apply(); + // use cookiemanager to create the cookie database + CookieManager.getInstance(); // we literally only use these to create the http cache folders try { FileUtils.forceMkdir(new File(MainApplication.getINSTANCE().getDataDir() + "/cache/cronet")); diff --git a/app/src/main/res/font/inter.xml b/app/src/main/res/font/inter.xml new file mode 100644 index 0000000..c57ba61 --- /dev/null +++ b/app/src/main/res/font/inter.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/font/interbold.otf b/app/src/main/res/font/interbold.otf new file mode 100644 index 0000000..c74cc0c Binary files /dev/null and b/app/src/main/res/font/interbold.otf differ diff --git a/app/src/main/res/font/interitalic.otf b/app/src/main/res/font/interitalic.otf new file mode 100644 index 0000000..39d6016 Binary files /dev/null and b/app/src/main/res/font/interitalic.otf differ diff --git a/app/src/main/res/font/interregular.otf b/app/src/main/res/font/interregular.otf new file mode 100644 index 0000000..84e6a61 Binary files /dev/null and b/app/src/main/res/font/interregular.otf differ diff --git a/app/src/main/res/font/jetbrainsmono.xml b/app/src/main/res/font/jetbrainsmono.xml new file mode 100644 index 0000000..e4162e8 --- /dev/null +++ b/app/src/main/res/font/jetbrainsmono.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/font/jetbrainsmonoregular.ttf b/app/src/main/res/font/jetbrainsmonoregular.ttf new file mode 100644 index 0000000..dff66cc Binary files /dev/null and b/app/src/main/res/font/jetbrainsmonoregular.ttf differ diff --git a/app/src/main/res/layout/activity_crash_handler.xml b/app/src/main/res/layout/activity_crash_handler.xml index ae7adde..3eae9ca 100644 --- a/app/src/main/res/layout/activity_crash_handler.xml +++ b/app/src/main/res/layout/activity_crash_handler.xml @@ -1,6 +1,14 @@ - - + + + @@ -37,21 +45,25 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - + + + - + - - - - - - - - - - - - + android:orientation="vertical"> - - + + android:hint="@string/feedback_name" + android:inputType="text" /> + + + - - + - - + android:hint="@string/feedback_message" + android:inputType="textMultiLine" /> - - - - - - + + + + + + + + + + + + + + + + + + - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 6ec24cf..97430ab 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -4,8 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/root_container" android:layout_width="match_parent" - android:paddingVertical="0dp" android:layout_height="match_parent" + android:paddingVertical="0dp" app:fitsSystemWindowsInsets="start|end|bottom|top" tools:context=".MainActivity"> @@ -22,7 +22,7 @@ android:id="@+id/blur_frame" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingBottom="84dp" > + android:paddingBottom="84dp"> @@ -103,8 +103,8 @@ android:id="@+id/bottom_navigation" android:layout_width="match_parent" android:layout_height="wrap_content" - android:visibility="visible" android:paddingBottom="0dp" + android:visibility="visible" app:compatShadowEnabled="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml index deee20b..ce6c9cf 100644 --- a/app/src/main/res/layout/activity_setup.xml +++ b/app/src/main/res/layout/activity_setup.xml @@ -60,7 +60,7 @@ android:layout_marginEnd="4dp" android:layout_weight="1" android:padding="12dp" - android:text="@string/setup_theme_button" + android:text="@string/theme" android:textSize="16sp" app:icon="@drawable/ic_baseline_palette_24" app:iconGravity="textStart" @@ -78,7 +78,7 @@ android:layout_marginTop="4dp" android:layout_weight="1" android:padding="12dp" - android:text="@string/setup_language_button" + android:text="@string/language" android:textSize="16sp" app:icon="@drawable/ic_baseline_language_24" app:iconGravity="textStart" diff --git a/app/src/main/res/layout/activity_update.xml b/app/src/main/res/layout/activity_update.xml index 96abe60..bead581 100644 --- a/app/src/main/res/layout/activity_update.xml +++ b/app/src/main/res/layout/activity_update.xml @@ -1,15 +1,15 @@ - + android:orientation="vertical" + tools:context=".UpdateActivity"> - + - - + android:layout_gravity="bottom|end" + android:layout_margin="4dp" + android:orientation="horizontal"> - + - + + + - - - + + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_checkbox.xml b/app/src/main/res/layout/dialog_checkbox.xml index a50699f..04bb300 100644 --- a/app/src/main/res/layout/dialog_checkbox.xml +++ b/app/src/main/res/layout/dialog_checkbox.xml @@ -1,16 +1,14 @@ + android:layout_height="wrap_content" + android:layout_marginHorizontal="8dp"> + android:layout_marginHorizontal="16dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/installer.xml b/app/src/main/res/layout/installer.xml index 6c0f558..97f9bd1 100644 --- a/app/src/main/res/layout/installer.xml +++ b/app/src/main/res/layout/installer.xml @@ -21,6 +21,7 @@ diff --git a/app/src/main/res/layout/installer_wrap.xml b/app/src/main/res/layout/installer_wrap.xml index 170ad85..9d0cb8e 100644 --- a/app/src/main/res/layout/installer_wrap.xml +++ b/app/src/main/res/layout/installer_wrap.xml @@ -10,6 +10,7 @@ + + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="8dp" + android:layout_marginVertical="3dp" + android:filterTouchesWhenObscured="true" + android:gravity="center_vertical" + android:orientation="vertical" + tools:ignore="RtlHardcoded,RtlSymmetry"> + android:layout_height="wrap_content"> + android:padding="6dp" + app:layout_constraintTop_toTopOf="parent"> + android:gravity="center_vertical" + android:orientation="horizontal"> + app:chipStartPadding="4dp" /> + android:textSize="16sp" /> + android:textSize="12sp" /> + + android:textSize="16sp" /> + android:orientation="vertical" + android:visibility="gone" + app:layout_constraintTop_toBottomOf="@id/main_card_text"> + android:scrollbars="none" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="@id/module_layout_helper"> diff --git a/app/src/main/res/layout/no_magisk.xml b/app/src/main/res/layout/no_magisk.xml index d13bf96..23acd3d 100644 --- a/app/src/main/res/layout/no_magisk.xml +++ b/app/src/main/res/layout/no_magisk.xml @@ -1,8 +1,8 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> - + \ No newline at end of file + android:id="@+id/switchWidget" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@null" + android:clickable="false" + android:focusable="false" /> \ No newline at end of file diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml index 8b92800..36f1d4e 100644 --- a/app/src/main/res/layout/settings_activity.xml +++ b/app/src/main/res/layout/settings_activity.xml @@ -1,5 +1,4 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 70a96c0..46ba63c 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -29,6 +29,8 @@ @color/light_colorBackgroundFloating @color/light_backgroundColor @style/Widget.Material3.Chip.Choice.Light + + @font/inter