Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 760b63bb authored by Aayush Gupta's avatar Aayush Gupta Committed by LuK1337
Browse files

ExactCalculator: Switch to dedicated layout for license activity 



Change-Id: I61b16816afc5051d6e7abf2750c62a3e0475eadc
Signed-off-by: default avatarAayush Gupta <aayushgupta219@gmail.com>
parent 0a67a772

res/layout/activity_license.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     SPDX-FileCopyrightText: 2024 The LineageOS Project

     SPDX-License-Identifier: Apache-2.0

-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:fitsSystemWindows="true"

    android:orientation="vertical"

    tools:context=".Calculator">



    <androidx.appcompat.widget.Toolbar

        android:id="@+id/toolbar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="?attr/actionBarSize"

        app:navigationIcon="?attr/homeAsUpIndicator"

        app:title="@string/menu_licenses" />



    <WebView

        android:id="@+id/webview"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />

</LinearLayout>

res/values/themes.xml

+5 −2
Original line number Diff line number Diff line
@@ -19,8 +19,11 @@ 
        <item name="android:layoutDirection">ltr</item>

    </style>



    <style name="Theme.Licenses">

        <item name="title">@string/menu_licenses</item>

    <style name="Theme.Licenses" parent="Theme.Material3.DayNight.NoActionBar">

        <item name="android:statusBarColor">?colorSurface</item>

        <item name="android:windowLightStatusBar">?isLightTheme</item>

        <item name="android:navigationBarColor">?colorSurface</item>

        <item name="android:windowLightNavigationBar">?isLightTheme</item>

    </style>



    <style name="Theme.Button" parent="ThemeOverlay.Material3.Button.TextButton">

src/com/android/calculator2/Licenses.java

+6 −13
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ 
package com.android.calculator2;



import android.os.Bundle;

import android.view.MenuItem;

import android.webkit.WebView;



import androidx.appcompat.app.AppCompatActivity;

import androidx.appcompat.widget.Toolbar;



public class Licenses extends AppCompatActivity {
@@ -18,19 +18,12 @@ public class Licenses extends AppCompatActivity { 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        setContentView(R.layout.activity_license);



        final WebView webView = new WebView(this);

        webView.loadUrl(LICENSE_URL);



        setContentView(webView);

    }

        Toolbar toolbar = requireViewById(R.id.toolbar);

        toolbar.setNavigationOnClickListener(v -> getOnBackPressedDispatcher().onBackPressed());



    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        if (item.getItemId() == android.R.id.home) {

            onBackPressed();

            return true;

        }

        return super.onOptionsItemSelected(item);

        WebView webView = requireViewById(R.id.webview);

        webView.loadUrl(LICENSE_URL);

    }

}