Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 32 additions & 4 deletions app/src/main/assets/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ body{
-webkit-transition: opacity 0.2s ease-in-out;
transition: opacity 0.2s ease-in-out;
}
*:not(.generedImg):not(.bubble){
*:not(.generedImg):not(.bubble):not(input):not(#customPrompt){
-webkit-user-select: none;
user-select: none;
}
.chat-container{
Expand Down Expand Up @@ -44,6 +45,7 @@ body{
-webkit-border-radius: 50%;
border-radius: 50%;
cursor: pointer;
-webkit-transition: -webkit-transform 0.2s, background-color 0.2s;
-webkit-transition: transform 0.2s, background-color 0.2s;
transition: transform 0.2s, background-color 0.2s;
margin-left: 10px;
Expand Down Expand Up @@ -156,15 +158,18 @@ body{
background-color: #444444;
}
.input-container {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
justify-content: center;
padding: 2vh 1.5vw;
background-color: #1e1e1e;
border-top: 1px solid #333333;
box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.5);
width: 100vw;
max-width: 100%;
width: 100%;
-webkit-box-sizing: border-box;
box-sizing: border-box;
overflow: hidden;
Expand All @@ -176,6 +181,8 @@ body{
.input-container button {
width: 10.5vw;
height: 10.5vw;
min-width: 35px;
min-height: 35px;
background-color: #2c2c2c;
background-size: 55% !important;
background-repeat: no-repeat;
Expand All @@ -186,10 +193,13 @@ body{
cursor: pointer;
-webkit-transition: transform 0.2s, background-color 0.2s;
transition: transform 0.2s, background-color 0.2s;
-webkit-flex-shrink: 0;
flex-shrink: 0;
}

.input-container input {
-webkit-box-flex: 1;
-webkit-flex: 1;
flex: 1;
margin: 0 1.8vw;
padding: 1.2vh 3vw;
Expand All @@ -202,6 +212,7 @@ body{
outline: none;
-webkit-box-sizing: border-box;
box-sizing: border-box;
-webkit-flex-shrink: 1;
flex-shrink: 1;
-webkit-appearance: none;
appearance: none;
Expand Down Expand Up @@ -282,14 +293,23 @@ pre code textarea:focus {
}

.plugin-switch-container {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
margin-bottom: 15px;
margin: 20px 0;
}

.plugin-switch {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
font-size: 16px;
min-height: 40px;
Expand Down Expand Up @@ -343,8 +363,15 @@ pre code textarea:focus {
color: #e0e0e0;
font-weight: 500;
letter-spacing: 0.5px;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
-webkit-box-flex: 1;
-webkit-flex: 1 1 0%;
flex: 1 1 0%;
min-width: 0;
word-break: break-word;
Expand Down Expand Up @@ -414,7 +441,7 @@ pre code textarea:focus {
font-size: 14px;
vertical-align: middle;
margin-left: 4px;
-webkit-transition: background-color 0.2s;
-webkit-transition: -webkit-background-color 0.2s, background-color 0.2s;
transition: background-color 0.2s;
}

Expand All @@ -435,6 +462,7 @@ pre code textarea:focus {
border-radius: 8px;
-webkit-box-shadow: 0 4px 6px rgba(0, 0, 0, 0.3);
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.3);
-webkit-transition: -webkit-background-color 0.2s, -webkit-transform 0.2s;
-webkit-transition: background-color 0.2s, transform 0.2s;
transition: background-color 0.2s, transform 0.2s;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.CreadoresProgram.CreaProDroid;
import android.app.Activity;
import android.os.Bundle;
import android.os.Build;
import android.webkit.WebView;
import android.content.Intent;
import android.net.Uri;
Expand Down Expand Up @@ -58,6 +59,9 @@ public void run(){
webSettings.setAllowFileAccess(true);
webSettings.setAllowContentAccess(true);
webSettings.setDatabaseEnabled(true);
if(Build.VERSION.SDK_INT <= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2){
webSettings.setDatabasePath(this.getApplicationContext().getDir("LocalStorageOld", Context.MODE_PRIVATE).getPath());
}
webSettings.setCacheMode(WebSettings.LOAD_DEFAULT);
webSettings.setBuiltInZoomControls(false);
webSettings.setDisplayZoomControls(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,21 @@
import android.webkit.WebView;
import android.webkit.WebChromeClient;
import android.webkit.JsResult;
import android.webkit.WebStorage;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.widget.EditText;
import android.webkit.JsPromptResult;
import android.graphics.Color;
import android.view.ContextThemeWrapper;
import android.os.Build;

public class ChromeExtra extends WebChromeClient {
private Context context;
private ContextThemeWrapper themeInput;
public ChromeExtra(Context context) {
this.context = context;
this.themeInput = new ContextThemeWrapper(this.context, android.R.style.Theme_Holo_Light_Dialog);
}
@Override
public boolean onJsAlert(WebView view, String url, String message, JsResult result) {
Expand Down Expand Up @@ -48,9 +54,8 @@ public void onClick(DialogInterface dialog, int which) {
}
@Override
public boolean onJsPrompt(WebView view, String url, String message, String defaultValue, JsPromptResult result) {
final EditText input = new EditText(context);
final EditText input = new EditText(themeInput);
input.setText(defaultValue);
input.setTextColor(Color.BLACK);
new AlertDialog.Builder(context, android.R.style.Theme_Holo_Light_Dialog)
.setTitle("CreaProDroid")
.setMessage(message)
Expand All @@ -69,4 +74,13 @@ public void onClick(DialogInterface dialog, int which) {
.create().show();
return true;
}
}
@SuppressWarnings("deprecation")
@Override
public void onExceededDatabaseQuota(String url, String databaseIdentifier, long currentQuota, long estimatedSize, long totalUsedQuota, WebStorage.QuotaUpdater quotaUpdater) {
if(Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN_MR2){
super.onExceededDatabaseQuota(url, databaseIdentifier, currentQuota, estimatedSize, totalUsedQuota, quotaUpdater);
return;
}
quotaUpdater.updateQuota(estimatedSize * 2);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ public void onInit(int status) {
@JavascriptInterface
public void finish() {
if(tts != null) {
tts.stop();
if(tts.isSpeaking()){
tts.stop();
}
tts.shutdown();
}
mWebView.destroy();
Expand Down Expand Up @@ -181,7 +183,7 @@ public void copyText(String text){
}
@JavascriptInterface
public void stopSpeak(){
if(tts != null) {
if(tts != null && tts.isSpeaking()) {
tts.stop();
}
}
Expand All @@ -198,7 +200,12 @@ public void startSpeechRecognition(){
}
@JavascriptInterface
public void clearCache(){
mWebView.clearCache(true);
mWebView.post(new Runnable() {
@Override
public void run() {
mWebView.clearCache(true);
}
});
}
@JavascriptInterface
public boolean isLatestVersionByGithub(){
Expand Down