diff --git a/.idea/gradle.xml b/.idea/gradle.xml index d878720..9f4645a 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -11,7 +11,8 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index fc59c45..fadb0eb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,6 +3,7 @@ \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 1e2a3c5..68f310c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,19 +5,21 @@ plugins { static def buildTime(){ - def date = new Date().format("dd.MM.yyyy, HH:mm:ss") + def date = new Date().format("dd.MM.yyyy, HH:mm") return date } android { - compileSdk 32 + compileSdk 33 defaultConfig { applicationId "ru.svolf.pcompiler" minSdk 21 - targetSdk 32 + targetSdk 33 versionCode 25 versionName "2.5.0" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' + + resConfigs "en", "ar", "bn", "fa", "hi", "in", "it", "pt", "ru", "si", "tr", "vi" } signingConfigs { release { @@ -43,34 +45,35 @@ android { sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 } + buildFeatures { viewBinding = true } + + namespace 'ru.svolf.pcompiler' } dependencies { +// def latestFastAdapterRelease = '5.7.0' implementation fileTree(include: ['*.jar'], dir: 'libs') androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) implementation 'androidx.appcompat:appcompat:1.5.1' - implementation 'com.google.android.material:material:1.6.1' - implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'com.google.android.material:material:1.7.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation 'androidx.preference:preference:1.2.0' - implementation 'androidx.legacy:legacy-preference-v14:1.0.0' testImplementation 'junit:junit:4.13.2' - implementation "org.jetbrains.kotlin:kotlin-stdlib:1.7.10" implementation 'com.faendir:acra:4.10.0' implementation 'io.reactivex.rxjava2:rxjava:2.2.17' implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' implementation 'com.squareup.okhttp3:okhttp:4.3.1' -// implementation "com.trello.rxlifecycle2:rxlifecycle:2.2.0" -// implementation "com.trello.rxlifecycle2:rxlifecycle-components:2.2.0" -// implementation "com.trello.rxlifecycle2:rxlifecycle-android:2.2.0" implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' - implementation files('libs/zip4j_1.3.2.jar') - implementation project(":blurkit") +// implementation "com.mikepenz:fastadapter:${latestFastAdapterRelease}" +// implementation "com.mikepenz:fastadapter-extensions-binding:${latestFastAdapterRelease}" // view binding helpers + implementation "net.lingala.zip4j:zip4j:2.11.2" + implementation project(":backdrop") + implementation project(":core-ui") } diff --git a/app/libs/zip4j_1.3.2.jar b/app/libs/zip4j_1.3.2.jar deleted file mode 100644 index 66a19e4..0000000 Binary files a/app/libs/zip4j_1.3.2.jar and /dev/null differ diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index ec0f856..9bd3db6 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -18,11 +18,7 @@ #retrolambda -dontwarn java.lang.invoke.* -dontwarn **$$Lambda$* -#butterknife --keep class butterknife.* --keep public class * implements butterknife.Unbinder { public (**, android.view.View); } --keepclasseswithmembernames class * { @butterknife.* ; } --keepclasseswithmembernames class * { @butterknife.* ; } + -dontwarn net.lingala.zip4j.** #okhttp3 -keepattributes Signature diff --git a/app/release/app-release.apk b/app/release/app-release.apk new file mode 100644 index 0000000..fd26d35 Binary files /dev/null and b/app/release/app-release.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 0000000..4111b45 --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "ru.svolf.pcompiler", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 25, + "versionName": "2.5.0", + "outputFile": "app-release.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5cd4314..96695bb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,10 +1,10 @@ - + + diff --git a/app/src/main/assets/changelog.txt b/app/src/main/assets/changelog.txt index 5c8641e..c0e6608 100644 --- a/app/src/main/assets/changelog.txt +++ b/app/src/main/assets/changelog.txt @@ -3,6 +3,14 @@ [-] - Исправлена ошибка [*] - Изменено +--- [2.5.0] --- +[!] Изменен дизайн. Удалено бокового меню +[+] Material You +[*] Совместимость с современными андроидами +[*] Фиксы разметки +[*] Тема приложения следует системной теме +[*] Удалена смена языка, взамен добавлены переводы от сообщества. Спасибо всем кто помогал! + --- [2.0.1] --- [+] Счётчик вкладок [-] Неправильная локаль при первом запуске diff --git a/app/src/main/java/ru/svolf/girl/ui/CodeText.java b/app/src/main/java/ru/svolf/girl/ui/CodeText.java index 7c85feb..28eebd9 100644 --- a/app/src/main/java/ru/svolf/girl/ui/CodeText.java +++ b/app/src/main/java/ru/svolf/girl/ui/CodeText.java @@ -19,26 +19,27 @@ public class CodeText extends ShaderText { private Context context; - private transient Paint paint = new Paint(); - private transient Paint bgPaint = new Paint(); + private final transient Paint paint = new Paint(); + private final transient Paint bgPaint = new Paint(); private Layout layout; public CodeText(Context context, AttributeSet attrs) { super(context, attrs); - - this.context = context; - bgPaint.setStyle(Paint.Style.FILL); - bgPaint.setColor(App.getColorFromAttr(getContext(), android.R.attr.windowBackground)); - - paint.setStyle(Paint.Style.FILL); - paint.setAntiAlias(true); - if (Preferences.INSTANCE.isMonospaceFontAllowed()){ - setTypeface(ResourcesCompat.getFont(getContext(), R.font.mono)); + if (!isInEditMode()) { + this.context = context; + bgPaint.setStyle(Paint.Style.FILL); + bgPaint.setColor(App.getColorFromAttr(getContext(), android.R.attr.windowBackground)); + + paint.setStyle(Paint.Style.FILL); + paint.setAntiAlias(true); + if (Preferences.INSTANCE.isMonospaceFontAllowed()) { + setTypeface(ResourcesCompat.getFont(getContext(), R.font.mono)); + } + setTextSize(Preferences.INSTANCE.getFontSize()); + paint.setColor(App.getColorFromAttr(getContext(), R.attr.icon_color)); + paint.setTextSize(getPixels(14)); + getViewTreeObserver().addOnGlobalLayoutListener(() -> layout = getLayout()); } - setTextSize(Preferences.INSTANCE.getFontSize()); - paint.setColor(App.getColorFromAttr(getContext(), android.R.attr.textColor)); - paint.setTextSize(getPixels(14)); - getViewTreeObserver().addOnGlobalLayoutListener(() -> layout = getLayout()); } private int getDigitCount() { @@ -53,27 +54,30 @@ private int getDigitCount() { @Override protected void onDraw(Canvas canvas) { - int padding = (int) getPixels(getDigitCount() * 10 + 10); - setPadding(padding, 0, 0, 0); - - int scrollY = getScrollY(); - int firstLine = layout.getLineForVertical(scrollY), lastLine; - - try { - lastLine = layout.getLineForVertical(scrollY + (getHeight() - getExtendedPaddingTop() - getExtendedPaddingBottom())); - } catch (NullPointerException npe) { - lastLine = layout.getLineForVertical(scrollY + (getHeight() - getPaddingTop() - getPaddingBottom())); + if (!isInEditMode()) { + int padding = (int) getPixels(getDigitCount() * 10 + 10); + setPadding(padding, 0, 0, 0); + + int scrollY = getScrollY(); + int firstLine = layout.getLineForVertical(scrollY), lastLine; + + try { + lastLine = layout.getLineForVertical(scrollY + (getHeight() - getExtendedPaddingTop() - getExtendedPaddingBottom())); + } catch (NullPointerException npe) { + lastLine = layout.getLineForVertical(scrollY + (getHeight() - getPaddingTop() - getPaddingBottom())); + } + + //the y position starts at the baseline of the first line + int positionY = getBaseline() + (layout.getLineBaseline(firstLine) - layout.getLineBaseline(0)); + drawLineNumber(canvas, layout, positionY, firstLine); + for (int i = firstLine + 1; i <= lastLine; i++) { + //get the next y position using the difference between the current and last baseline + positionY += layout.getLineBaseline(i) - layout.getLineBaseline(i - 1); + drawLineNumber(canvas, layout, positionY, i); + } } + super.onDraw(canvas); - //the y position starts at the baseline of the first line - int positionY = getBaseline() + (layout.getLineBaseline(firstLine) - layout.getLineBaseline(0)); - drawLineNumber(canvas, layout, positionY, firstLine); - for (int i = firstLine + 1; i <= lastLine; i++) { - //get the next y position using the difference between the current and last baseline - positionY += layout.getLineBaseline(i) - layout.getLineBaseline(i - 1); - drawLineNumber(canvas, layout, positionY, i); - } - super.onDraw(canvas); } private void drawLineNumber(Canvas canvas, Layout layout, int positionY, int line) { diff --git a/app/src/main/java/ru/svolf/girl/ui/GirlEditText.java b/app/src/main/java/ru/svolf/girl/ui/GirlEditText.java index e326e44..8904f57 100644 --- a/app/src/main/java/ru/svolf/girl/ui/GirlEditText.java +++ b/app/src/main/java/ru/svolf/girl/ui/GirlEditText.java @@ -2,7 +2,9 @@ import android.content.Context; import android.util.AttributeSet; +import android.widget.EditText; +import androidx.appcompat.widget.AppCompatEditText; import androidx.core.content.res.ResourcesCompat; import com.google.android.material.textfield.TextInputEditText; @@ -14,7 +16,7 @@ * Created by Snow Volf on 25.09.2017, 21:02 */ -public class GirlEditText extends TextInputEditText { +public class GirlEditText extends AppCompatEditText { public GirlEditText(Context context) { super(context); @@ -32,10 +34,12 @@ public GirlEditText(Context context, AttributeSet attrs, int defStyleAttr) { } private void init(){ - if (Preferences.INSTANCE.isMonospaceFontAllowed()){ - setTypeface(ResourcesCompat.getFont(getContext(), R.font.mono)); + if (!isInEditMode()) { + if (Preferences.INSTANCE.isMonospaceFontAllowed()) { + setTypeface(ResourcesCompat.getFont(getContext(), R.font.mono)); + } + setTextSize(Preferences.INSTANCE.getFontSize()); } - setTextSize(Preferences.INSTANCE.getFontSize()); } public void clear(){ diff --git a/app/src/main/java/ru/svolf/girl/ui/GirlToolbar.java b/app/src/main/java/ru/svolf/girl/ui/GirlToolbar.java index 59e612c..d639392 100644 --- a/app/src/main/java/ru/svolf/girl/ui/GirlToolbar.java +++ b/app/src/main/java/ru/svolf/girl/ui/GirlToolbar.java @@ -30,7 +30,7 @@ public GirlToolbar(Context context, @Nullable AttributeSet attrs, int defStyleAt } public View getTabIndicator() { - return getMenu().getItem(0).getActionView(); + return getMenu().getItem(1).getActionView(); } public void setTabIndicatorValue(int value){ diff --git a/app/src/main/java/ru/svolf/pcompiler/App.java b/app/src/main/java/ru/svolf/pcompiler/App.java index fadf31e..f47861c 100644 --- a/app/src/main/java/ru/svolf/pcompiler/App.java +++ b/app/src/main/java/ru/svolf/pcompiler/App.java @@ -40,7 +40,6 @@ import io.reactivex.plugins.RxJavaPlugins; import ru.svolf.girl.reactive.SimpleObservable; import ru.svolf.pcompiler.util.Constants; -import ru.svolf.pcompiler.util.LocaleGirl; import ru.svolf.pcompiler.util.RuntimeUtil; import ru.svolf.pcompiler.util.StringWrapper; @@ -110,10 +109,10 @@ public void onCreate() { DynamicColors.applyToActivitiesIfAvailable(this); } - @Override - protected void attachBaseContext(Context base) { - super.attachBaseContext(LocaleGirl.INSTANCE.onAttach(base, LocaleGirl.INSTANCE.getDefaultLocale().getLanguage())); - } +// @Override +// protected void attachBaseContext(Context base) { +// super.attachBaseContext(LocaleGirl.INSTANCE.onAttach(base, LocaleGirl.INSTANCE.getDefaultLocale().getLanguage())); +// } public SharedPreferences getPreferences() { if (preferences == null) { diff --git a/app/src/main/java/ru/svolf/pcompiler/patch/PatchArray.java b/app/src/main/java/ru/svolf/pcompiler/patch/PatchArray.java index 7792536..ca68e77 100644 --- a/app/src/main/java/ru/svolf/pcompiler/patch/PatchArray.java +++ b/app/src/main/java/ru/svolf/pcompiler/patch/PatchArray.java @@ -36,6 +36,10 @@ public void removeItemAt(String tabTag) { } } + public String getItem(String tabTag){ + return get(tabTag); + } + public void setItemAt(String tabTag, ReactiveBuilder builder) { try { put(tabTag, builder.toString()); @@ -46,4 +50,5 @@ public void setItemAt(String tabTag, ReactiveBuilder builder) { e.printStackTrace(); } } + } diff --git a/app/src/main/java/ru/svolf/pcompiler/patch/ReactiveBuilder.java b/app/src/main/java/ru/svolf/pcompiler/patch/ReactiveBuilder.java index 9a9443e..b21613f 100644 --- a/app/src/main/java/ru/svolf/pcompiler/patch/ReactiveBuilder.java +++ b/app/src/main/java/ru/svolf/pcompiler/patch/ReactiveBuilder.java @@ -1,5 +1,6 @@ package ru.svolf.pcompiler.patch; +import android.util.Log; import android.widget.EditText; import ru.svolf.pcompiler.settings.Preferences; @@ -9,16 +10,20 @@ */ public class ReactiveBuilder { + private static final String TAG = "ReactiveBuilder"; private final StringBuilder mBuilder; public ReactiveBuilder(){ + Log.d(TAG, "ReactiveBuilder: create"); mBuilder = new StringBuilder(); } // Generate a full patch string public static StringBuilder build(){ + Log.d(TAG, "build: call build"); StringBuilder str = new StringBuilder(); for (String s: PatchCollection.getCollection().values()) { + Log.d(TAG, "build: items = " + s); str.append(s); } return str; @@ -146,7 +151,7 @@ public ReactiveBuilder escapeComment(String comment){ // [ \t]*\\R[ \t]* // Escape most common sub sequences with its escaped equivalents - private ReactiveBuilder escapeFind(String find){ + private String escapeFind(String find){ if (Preferences.INSTANCE.isEscapeFindAllowed()) { find = find .replace(" .", " \\.") @@ -161,8 +166,7 @@ private ReactiveBuilder escapeFind(String find){ .replace(System.lineSeparator(), "\\n ") .replaceAll(RegexPattern.INSTANCE.getEIGHT_SPACES(), " "); } - mBuilder.append(find); - return this; + return find; } @Override diff --git a/app/src/main/java/ru/svolf/pcompiler/patch/RegexPattern.kt b/app/src/main/java/ru/svolf/pcompiler/patch/RegexPattern.kt index 948ac77..bfb02c3 100644 --- a/app/src/main/java/ru/svolf/pcompiler/patch/RegexPattern.kt +++ b/app/src/main/java/ru/svolf/pcompiler/patch/RegexPattern.kt @@ -8,7 +8,7 @@ import java.util.regex.Pattern object RegexPattern { var COMMON_SYMBOLS = Pattern.compile("\\[|\\]|\\[/|\\*|\\{|\\}|true|false") - var ATTRIBUTE = Pattern.compile("MIN_ENGINE_VER|AUTHOR|PACKAGE|MATCH_GOTO|MATCH_ASSIGN|MATCH_REPLACE|GOTO|ADD_FILES|" + "ADD_FILES|REMOVE_FILES|MERGE|DUMMY|APPLICATION|LAUNCHER_ACTIVTIES|ACTIVTIES|GROUP\\d+") + var ATTRIBUTE = Pattern.compile("MIN_ENGINE_VER|AUTHOR|PACKAGE|MATCH_GOTO|MATCH_ASSIGN|MATCH_REPLACE|GOTO|ADD_FILES|" + "REMOVE_FILES|MERGE|DUMMY|APPLICATION|LAUNCHER_ACTIVTIES|ACTIVTIES|GROUP\\d+") var SUB_ATTRIBUTE = Pattern.compile("REGEX:|MATCH:|REPLACE:|GOTO:|TARGET:|ASSIGN:|MERGE:|SOURCE:|EXTRACT:|NAME:") var STRING = Pattern.compile("(?:'[^'\\\\\\n]*(?:\\\\.[^'\\\\\\n]*)*')|(?:\"[^\"\\\\\\n]*(?:\\\\.[^\"\\\\\\n]*)*\")") var OPERATOR = Pattern.compile("\\([^)]+\\)|\\$", Pattern.CASE_INSENSITIVE) diff --git a/app/src/main/java/ru/svolf/pcompiler/tabs/TabFragment.java b/app/src/main/java/ru/svolf/pcompiler/tabs/TabFragment.java index cf7d6e4..56476e1 100644 --- a/app/src/main/java/ru/svolf/pcompiler/tabs/TabFragment.java +++ b/app/src/main/java/ru/svolf/pcompiler/tabs/TabFragment.java @@ -23,6 +23,7 @@ import ru.svolf.girl.ui.GirlToolbar; import ru.svolf.pcompiler.App; import ru.svolf.pcompiler.R; +import ru.svolf.pcompiler.databinding.FragmentBaseBinding; import ru.svolf.pcompiler.ui.activity.TabbedActivity; import ru.svolf.pcompiler.ui.fragment.NativeContainerFragment; import ru.svolf.pcompiler.util.Constants; @@ -47,10 +48,8 @@ public class TabFragment extends NativeContainerFragment { protected RelativeLayout fragmentContainer; protected FrameLayout fragmentContent; protected CoordinatorLayout coordinatorLayout; - protected AppBarLayout appBarLayout; - protected CollapsingToolbarLayout toolbarLayout; - public static GirlToolbar toolbar; - protected TextView toolbarTitleView, toolbarSubtitleView; + + protected TextView toolbarSubtitleView; public TabFragment() { parentTag = TabManager.getActiveTag(); @@ -73,7 +72,6 @@ public final void setTitle(String newTitle) { this.title = newTitle; if (tabTitle == null) getTabActivity().updateTabList(); - toolbarTitleView.setText(getTitle()); } protected final String getSubtitle() { @@ -101,10 +99,6 @@ public void setTabTitle(String tabTitle) { getTabActivity().updateTabList(); } - public Menu getMenu() { - return toolbar.getMenu(); - } - //False - можно закрывать //True - еще нужно что-то сделать, не закрывать @@ -145,11 +139,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, //Осторожно! Чувствительно к структуре разметки! (по идеи так должно работать чуть быстрее) fragmentContainer = rootView.findViewById(R.id.fragment_container); coordinatorLayout = fragmentContainer.findViewById(R.id.coordinator_layout); - appBarLayout = coordinatorLayout.findViewById(R.id.appbar_layout); - toolbarLayout = appBarLayout.findViewById(R.id.toolbar_layout); - toolbar = toolbarLayout.findViewById(R.id.toolbar); - toolbarTitleView = toolbar.findViewById(R.id.toolbar_title); - toolbarSubtitleView = toolbar.findViewById(R.id.toolbar_subtitle); + toolbarSubtitleView = coordinatorLayout.findViewById(R.id.toolbar_subtitle); fragmentContent = coordinatorLayout.findViewById(R.id.fragment_content); //Для обновления вьюх @@ -158,21 +148,6 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, return rootView; } - @Override - public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - toolbar = view.findViewById(R.id.toolbar); - toolbar.inflateMenu(R.menu.menu_tab_indicator); - toolbar.setNavigationOnClickListener(v -> getTabActivity().getDrawers().openMenu()); - toolbar.getTabIndicator().setOnClickListener(v -> getTabActivity().getDrawers().openTabs()); - ActionBarDrawerToggle toggle = - new ActionBarDrawerToggle(getActivity(), getTabActivity().getDrawer(), toolbar, - R.string.app_name, R.string.app_name); - toggle.getDrawerArrowDrawable().setColor(App.getColorFromAttr(getContext(), R.attr.icon_color)); - getTabActivity().getDrawer().addDrawerListener(toggle); - toggle.syncState(); - } - protected void baseInflateFragment(LayoutInflater inflater, @LayoutRes int res) { inflater.inflate(res, fragmentContent, true); } @@ -190,12 +165,6 @@ protected void addBaseToolbarMenu() { } - @Override - public void onActivityCreated(@Nullable Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - Log.d(Constants.INSTANCE.getTAG(), "onactivitycreated args = " + getArguments() + " : savedInstance = " + savedInstanceState + " : title = " + title); - } - @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); diff --git a/app/src/main/java/ru/svolf/pcompiler/ui/activity/AboutActivity.java b/app/src/main/java/ru/svolf/pcompiler/ui/activity/AboutActivity.java index f47e87b..f895055 100644 --- a/app/src/main/java/ru/svolf/pcompiler/ui/activity/AboutActivity.java +++ b/app/src/main/java/ru/svolf/pcompiler/ui/activity/AboutActivity.java @@ -133,4 +133,10 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis super.onRequestPermissionsResult(requestCode, permissions, grantResults); App.ctx().onRequestPermissionsResult(requestCode, permissions, grantResults); } + + @Override + protected void onDestroy() { + binding = null; + super.onDestroy(); + } } \ No newline at end of file diff --git a/app/src/main/java/ru/svolf/pcompiler/ui/activity/BaseActivity.kt b/app/src/main/java/ru/svolf/pcompiler/ui/activity/BaseActivity.kt index 51df10a..8cc9346 100644 --- a/app/src/main/java/ru/svolf/pcompiler/ui/activity/BaseActivity.kt +++ b/app/src/main/java/ru/svolf/pcompiler/ui/activity/BaseActivity.kt @@ -3,16 +3,12 @@ package ru.svolf.pcompiler.ui.activity import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import android.content.IntentFilter import android.os.Bundle import android.transition.Explode import android.transition.Fade -import android.view.WindowManager import androidx.appcompat.app.AppCompatActivity import androidx.localbroadcastmanager.content.LocalBroadcastManager -import ru.svolf.pcompiler.util.LocaleGirl - /** * Created by Snow Volf on 19.08.2017, 12:09 */ @@ -30,9 +26,9 @@ open class BaseActivity : AppCompatActivity() { } } - override fun attachBaseContext(base: Context) { - super.attachBaseContext(LocaleGirl.onAttach(base)) - } +// override fun attachBaseContext(base: Context) { +// super.attachBaseContext(LocaleGirl.onAttach(base)) +// } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -50,9 +46,4 @@ open class BaseActivity : AppCompatActivity() { LocalBroadcastManager.getInstance(this).unregisterReceiver(mThemeReceiver) super.onDestroy() } - - override fun onBackPressed() { - super.onBackPressed() - finishAfterTransition() - } } diff --git a/app/src/main/java/ru/svolf/pcompiler/ui/activity/HelpActivity.kt b/app/src/main/java/ru/svolf/pcompiler/ui/activity/HelpActivity.kt index b56154b..bad5183 100644 --- a/app/src/main/java/ru/svolf/pcompiler/ui/activity/HelpActivity.kt +++ b/app/src/main/java/ru/svolf/pcompiler/ui/activity/HelpActivity.kt @@ -3,6 +3,8 @@ package ru.svolf.pcompiler.ui.activity import android.os.Bundle import android.widget.Button import android.widget.TextView +import android.widget.Toolbar +import ru.svolf.pcompiler.App import ru.svolf.pcompiler.R import ru.svolf.pcompiler.settings.Preferences @@ -16,6 +18,8 @@ class HelpActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_help) + val toolbar = findViewById(R.id.toolbar) + toolbar.setPadding(0, App.ctx().statusBarHeight, 0, 0) val content = findViewById(R.id.textView) content.text = StrF.parseText("help/help.txt") val read = findViewById