Skip to content

🎨 Implement Material You #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kabirnayeem99 wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

🎨 Implement Material You #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61df0b1
📦 feat [theming]: add material you to the app
kabirnayeem99 Apr 1, 2022
bfcea1d
📦 feat [theming]: add material you to the app
kabirnayeem99 Apr 1, 2022
fd70a85
📦 feat [theming]: add material you to the app
kabirnayeem99 Apr 1, 2022
bada85f
📦 feat [theming]: add material you to the app
kabirnayeem99 Apr 1, 2022
b72414e
📦 feat [theming]: add material you to the app
kabirnayeem99 Apr 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ android {
delete fileTree('src/main') {
include '**/AndroidManifest.xml'
}
ant.move(file: 'src/main/AndroidManifest_original.xml', tofile:'src/main/AndroidManifest.xml')
ant.move(file: 'src/main/AndroidManifest_original.xml', tofile: 'src/main/AndroidManifest.xml')

}
}

compileSdkVersion 31
buildToolsVersion "31.0.0"
compileSdkVersion 32
buildToolsVersion "32.1.0-rc1"
splits {
abi {
enable true
Expand Down Expand Up @@ -46,7 +46,7 @@ android {
defaultConfig {
applicationId "com.cylonid.nativealpha"
minSdkVersion 26
targetSdkVersion 31
targetSdkVersion 32
versionCode 1200
versionName "1.2.0"

Expand Down Expand Up @@ -113,36 +113,37 @@ repositories {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation 'com.mikhaellopez:circularprogressbar:3.0.3'
implementation 'org.jsoup:jsoup:1.14.1'
implementation 'com.mikhaellopez:circularprogressbar:3.1.0'
implementation 'org.jsoup:jsoup:1.14.3'
implementation 'org.adblockplus:adblock-android-webview:5.0.0'
implementation 'com.github.ihimanshurawat:Hasher:1.2'
implementation "com.google.android.material:material:1.5.0"
implementation 'androidx.navigation:navigation-fragment:2.4.1'
implementation 'androidx.navigation:navigation-ui:2.4.1'
implementation 'com.google.code.gson:gson:2.8.7'
implementation 'com.google.code.gson:gson:2.9.0'
implementation 'io.github.medyo:android-about-page:2.0.0'
implementation 'androidx.webkit:webkit:1.4.0'
implementation 'com.jakewharton:process-phoenix:2.1.2'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.robolectric:robolectric:4.3.1'
testImplementation 'org.json:json:20210307'
testImplementation 'org.json:json:20220320'
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-web:3.4.0'
androidTestImplementation 'androidx.test:rules:1.4.0'
androidTestImplementation 'androidx.test:runner:1.4.0'
androidTestUtil 'androidx.test:orchestrator:1.4.1'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
implementation "com.mikepenz:aboutlibraries:10.0.0"
implementation "com.mikepenz:aboutlibraries-core:10.0.0"
implementation 'com.mikepenz:aboutlibraries:10.1.0'
implementation 'com.mikepenz:aboutlibraries-core:10.1.0'
implementation 'pub.devrel:easypermissions:3.0.0'
}

int NUM_OF_CONTAINERS = 8
String placeholder = "<!--Placeholder-->"

0.upto(NUM_OF_CONTAINERS-1) { int i ->
def trTask = tasks.register( "createWebViewclass${i}", Copy ) {
0.upto(NUM_OF_CONTAINERS - 1) { int i ->
def trTask = tasks.register("createWebViewclass${i}", Copy) {
from 'src/main/java/com/cylonid/nativealpha/WebViewActivity.java'
into 'src/main/java/com/cylonid/nativealpha'
filter {
Expand All @@ -156,12 +157,12 @@ String placeholder = "<!--Placeholder-->"
}

def renameManifest = tasks.register("renameManifest") {
ant.move(file: 'src/main/AndroidManifest.xml', tofile:'src/main/AndroidManifest_original.xml')
ant.move(file: 'src/main/AndroidManifest.xml', tofile: 'src/main/AndroidManifest_original.xml')
}
preBuild.dependsOn renameManifest


def generateWebViewActivities = tasks.register( "extendAndroidManifest", Copy ) {
def generateWebViewActivities = tasks.register("extendAndroidManifest", Copy) {
from 'src/main/AndroidManifest_original.xml'
into 'src/main'

Expand Down
98 changes: 97 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,103 @@
android:documentLaunchMode="intoExisting"
/>

<!--Placeholder-->
<activity
android:name=".__WebViewActivity_0"
Copy link
Owner

@cylonid cylonid Apr 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are leftovers of an unsuccessfull build. They shouldn't be commited.

android:label="@string/app_name_unicode"
android:parentActivityName=".MainActivity"
android:icon="@mipmap/native_alpha"
android:roundIcon="@mipmap/native_alpha"
android:theme="@style/AppTheme.NoActionBar.Webapp"
android:configChanges="orientation|screenSize"
android:launchMode="standard"
android:process=":web_sandbox_0"
android:documentLaunchMode="intoExisting"
/>
<activity
android:name=".__WebViewActivity_1"
android:label="@string/app_name_unicode"
android:parentActivityName=".MainActivity"
android:icon="@mipmap/native_alpha"
android:roundIcon="@mipmap/native_alpha"
android:theme="@style/AppTheme.NoActionBar.Webapp"
android:configChanges="orientation|screenSize"
android:launchMode="standard"
android:process=":web_sandbox_1"
android:documentLaunchMode="intoExisting"
/>
<activity
android:name=".__WebViewActivity_2"
android:label="@string/app_name_unicode"
android:parentActivityName=".MainActivity"
android:icon="@mipmap/native_alpha"
android:roundIcon="@mipmap/native_alpha"
android:theme="@style/AppTheme.NoActionBar.Webapp"
android:configChanges="orientation|screenSize"
android:launchMode="standard"
android:process=":web_sandbox_2"
android:documentLaunchMode="intoExisting"
/>
<activity
android:name=".__WebViewActivity_3"
android:label="@string/app_name_unicode"
android:parentActivityName=".MainActivity"
android:icon="@mipmap/native_alpha"
android:roundIcon="@mipmap/native_alpha"
android:theme="@style/AppTheme.NoActionBar.Webapp"
android:configChanges="orientation|screenSize"
android:launchMode="standard"
android:process=":web_sandbox_3"
android:documentLaunchMode="intoExisting"
/>
<activity
android:name=".__WebViewActivity_4"
android:label="@string/app_name_unicode"
android:parentActivityName=".MainActivity"
android:icon="@mipmap/native_alpha"
android:roundIcon="@mipmap/native_alpha"
android:theme="@style/AppTheme.NoActionBar.Webapp"
android:configChanges="orientation|screenSize"
android:launchMode="standard"
android:process=":web_sandbox_4"
android:documentLaunchMode="intoExisting"
/>
<activity
android:name=".__WebViewActivity_5"
android:label="@string/app_name_unicode"
android:parentActivityName=".MainActivity"
android:icon="@mipmap/native_alpha"
android:roundIcon="@mipmap/native_alpha"
android:theme="@style/AppTheme.NoActionBar.Webapp"
android:configChanges="orientation|screenSize"
android:launchMode="standard"
android:process=":web_sandbox_5"
android:documentLaunchMode="intoExisting"
/>
<activity
android:name=".__WebViewActivity_6"
android:label="@string/app_name_unicode"
android:parentActivityName=".MainActivity"
android:icon="@mipmap/native_alpha"
android:roundIcon="@mipmap/native_alpha"
android:theme="@style/AppTheme.NoActionBar.Webapp"
android:configChanges="orientation|screenSize"
android:launchMode="standard"
android:process=":web_sandbox_6"
android:documentLaunchMode="intoExisting"
/>
<activity
android:name=".__WebViewActivity_7"
android:label="@string/app_name_unicode"
android:parentActivityName=".MainActivity"
android:icon="@mipmap/native_alpha"
android:roundIcon="@mipmap/native_alpha"
android:theme="@style/AppTheme.NoActionBar.Webapp"
android:configChanges="orientation|screenSize"
android:launchMode="standard"
android:process=":web_sandbox_7"
android:documentLaunchMode="intoExisting"
/>

<activity
android:name="com.cylonid.nativealpha.SettingsActivity"
android:parentActivityName=".MainActivity"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/cylonid/nativealpha/AboutActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ Element showEULA() {
license.setTitle(getString(R.string.eula_content));
return license;
}

Element showLicense() {
Element license = new Element();

Expand All @@ -56,6 +57,7 @@ Element showLicense() {
return license;

}

Element showPayPal() {
Element license = new Element();

Expand Down Expand Up @@ -83,7 +85,6 @@ Element showOpenSourcelibs() {
}



// Element getCopyRightsElement() {
// Element copyRightsElement = new Element();
// final String copyrights = String.format(getString(R.string.copy_right), Calendar.getInstance().get(Calendar.YEAR));
Expand Down
26 changes: 13 additions & 13 deletions app/src/main/java/com/cylonid/nativealpha/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package com.cylonid.nativealpha;

import static android.widget.LinearLayout.HORIZONTAL;

import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.text.Html;
import android.text.Spanned;
Expand All @@ -12,7 +13,6 @@
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.Switch;

import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
Expand All @@ -22,12 +22,12 @@
import com.cylonid.nativealpha.model.WebApp;
import com.cylonid.nativealpha.util.Const;
import com.cylonid.nativealpha.util.Utility;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.switchmaterial.SwitchMaterial;

import java.util.ArrayList;

import static android.widget.LinearLayout.HORIZONTAL;


public class MainActivity extends AppCompatActivity {
private LinearLayout mainScreen;
Expand All @@ -50,7 +50,6 @@ protected void onCreate(Bundle savedInstanceState) {
FloatingActionButton fab = findViewById(R.id.fab);
fab.setOnClickListener(view -> buildAddWebsiteDialog(getString(R.string.add_webapp)));


}

@Override
Expand All @@ -74,9 +73,9 @@ protected void onNewIntent(Intent intent) {


private void buildImportSuccessDialog() {
final AlertDialog.Builder builder = new AlertDialog.Builder(this);
final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);

String message = getString(R.string.import_success_dialog_txt2) + "\n\n" + getString(R.string.import_success_dialog_txt3);
String message = getString(R.string.import_success_dialog_txt2) + "\n\n" + getString(R.string.import_success_dialog_txt3);

builder.setMessage(message);
builder.setCancelable(false);
Expand All @@ -89,7 +88,7 @@ private void buildImportSuccessDialog() {
WebApp webapp = webapps.get(i);
boolean last_webapp = i == webapps.size() - 1;
Spanned msg = Html.fromHtml(getString(R.string.restore_shortcut, webapp.getTitle()), Html.FROM_HTML_MODE_COMPACT);
final AlertDialog addition_dialog = new AlertDialog.Builder(this)
final AlertDialog addition_dialog = new MaterialAlertDialogBuilder(this)
.setMessage(msg)
.setPositiveButton(android.R.string.yes, (dialog1, which) -> {
ShortcutDialogFragment frag = ShortcutDialogFragment.newInstance(webapp);
Expand All @@ -104,7 +103,8 @@ private void buildImportSuccessDialog() {
}

});
builder.setNegativeButton(getString(android.R.string.no), (dialog, id) -> { });
builder.setNegativeButton(getString(android.R.string.no), (dialog, id) -> {
});
builder.create().show();
}

Expand Down Expand Up @@ -157,6 +157,7 @@ private ImageButton generateImageButton(String name, int resourceID, int webappI

return btn;
}

private void addRow(final WebApp webapp) {
int row_height = (int) getResources().getDimension(R.dimen.line_height);
int transparent_color = ResourcesCompat.getColor(getResources(), R.color.transparent, null);
Expand All @@ -182,7 +183,6 @@ private void addRow(final WebApp webapp) {
intent.putExtra(Const.INTENT_WEBAPPID, webapp.getID());
intent.setAction(Intent.ACTION_VIEW);
startActivity(intent);

});

ImageButton btn_delete = generateImageButton("btnDelete", R.drawable.ic_delete_black_24dp, webapp.getID(), ll_row);
Expand All @@ -196,9 +196,9 @@ private void addRow(final WebApp webapp) {
private void buildAddWebsiteDialog(String title) {
final View inflated_view = getLayoutInflater().inflate(R.layout.add_website_dialogue, null);
final EditText url = (EditText) inflated_view.findViewById(R.id.websiteUrl);
final Switch create_shortcut = (Switch) inflated_view.findViewById(R.id.switchCreateShortcut);
final SwitchMaterial create_shortcut = (SwitchMaterial) inflated_view.findViewById(R.id.switchCreateShortcut);

final AlertDialog dialog = new AlertDialog.Builder(MainActivity.this)
final AlertDialog dialog = new MaterialAlertDialogBuilder(MainActivity.this)
.setView(inflated_view)
.setTitle(title)
.setPositiveButton(android.R.string.ok, null) //Set to null. We override the onclick
Expand Down Expand Up @@ -232,7 +232,7 @@ private void buildAddWebsiteDialog(String title) {

private void buildDeleteItemDialog(final int ID) {

AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(MainActivity.this);
builder.setMessage(getString(R.string.delete_question));
builder.setPositiveButton(getString(android.R.string.yes), (dialog, id) -> {
WebApp webapp = DataManager.getInstance().getWebApp(ID);
Expand Down
Loading