Skip to content

Commit 1c28ddc

Browse files
riverforriverfor
committed
Changes
 1, Hide gist button before we can make it stable. 2, Improve editor, make it's OK to override file.
1 parent ac24024 commit 1c28ddc

File tree

9 files changed

+102
-70
lines changed

9 files changed

+102
-70
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ build.gradle.new
2020
captures
2121
old.git
2222
qpython/qpython.key
23+
qpython/cn/release/output.json
24+
qpython/cn
25+
qpython/google

‎qpysl4a‎

‎qpython/cn/release/output.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎qpython/src/cn/AndroidManifest.xml‎

Lines changed: 68 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -42,81 +42,86 @@
4242
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
4343
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
4444
<uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
45+
46+
<uses-permission android:name="android.permission.SET_DEBUG_APP"/>
47+
<uses-permission android:name="android.permission.WRITE_SETTINGS"/>
48+
<uses-permission android:name="android.permission.READ_MEDIA_STORAGE"/>
49+
<uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE"/>
4550
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
4651

4752
<uses-permission android:name="com.android.vending.BILLING"/>
4853

4954
<application
50-
android:networkSecurityConfig="@xml/network_security_config"
51-
android:name="org.qpython.qpy.main.app.App"
52-
android:allowBackup="true"
53-
android:hardwareAccelerated="true"
54-
android:icon="@drawable/ic_launcher"
55-
android:label="@string/app_name"
56-
android:largeHeap="true"
57-
android:supportsRtl="true"
58-
android:theme="@style/AppTheme">
59-
<uses-library android:name="org.apache.http.legacy" android:required="false"/>
55+
android:networkSecurityConfig="@xml/network_security_config"
56+
android:name="org.qpython.qpy.main.app.App"
57+
android:allowBackup="true"
58+
android:hardwareAccelerated="true"
59+
android:icon="@drawable/ic_launcher"
60+
android:label="@string/app_name"
61+
android:largeHeap="true"
62+
android:supportsRtl="true"
63+
android:theme="@style/AppTheme">
64+
<uses-library android:name="org.apache.http.legacy" android:required="false"/>
6065

66+
<meta-data
67+
android:name="com.google.firebase.messaging.default_notification_icon"
68+
android:resource="@drawable/img_home_logo"/>
69+
70+
<service android:name=".main.service.QPyService"/>
71+
<service android:name="org.qpython.qsl4a.QPyScriptService"/>
72+
<service android:name=".main.service.FTPServerService"/>
73+
74+
<activity
75+
android:name=".main.activity.SignInActivity"
76+
android:launchMode="singleTask"/>
77+
78+
<activity
79+
android:name="org.qpython.qpylib.MPyApi"
80+
android:exported="true"
81+
android:theme="@style/Theme.AppCompat"/>
82+
83+
<service
84+
android:name="org.qpython.qpylib.MPyService"
85+
android:exported="true"
86+
tools:ignore="ExportedService"/>
87+
88+
<activity
89+
android:name=".main.activity.SplashActivity"
90+
android:theme="@style/FullscreenTheme"
91+
>
92+
<intent-filter>
93+
<action android:name="android.intent.action.MAIN"/>
94+
<category android:name="android.intent.category.LAUNCHER"/>
95+
</intent-filter>
96+
</activity>
97+
98+
<activity
99+
android:name="org.qpython.qpy.main.activity.HomeMainActivity"
100+
android:launchMode="singleTask">
61101
<meta-data
62-
android:name="com.google.firebase.messaging.default_notification_icon"
63-
android:resource="@drawable/img_home_logo"/>
102+
android:name="android.app.shortcuts"
103+
android:resource="@xml/shortcuts"/>
104+
</activity>
64105

65-
<service android:name=".main.service.QPyService"/>
66-
<service android:name="org.qpython.qsl4a.QPyScriptService"/>
67-
<service android:name=".main.service.FTPServerService"/>
68106

69-
<activity
70-
android:name=".main.activity.SignInActivity"
71-
android:launchMode="singleTask"/>
107+
<activity
108+
android:name="org.qpython.qpy.main.activity.QWebViewActivity"
109+
android:label="@string/browser">
110+
<intent-filter>
111+
<action android:name="android.intent.action.VIEW"/>
72112

73-
<activity
74-
android:name="org.qpython.qpylib.MPyApi"
75-
android:exported="true"
76-
android:theme="@style/Theme.AppCompat"/>
113+
<category android:name="android.intent.category.DEFAULT"/>
114+
<category android:name="android.intent.category.BROWSABLE"/>
77115

78-
<service
79-
android:name="org.qpython.qpylib.MPyService"
80-
android:exported="true"
81-
tools:ignore="ExportedService"/>
82-
83-
<activity
84-
android:name=".main.activity.SplashActivity"
85-
android:theme="@style/FullscreenTheme"
86-
>
87-
<intent-filter>
88-
<action android:name="android.intent.action.MAIN"/>
89-
<category android:name="android.intent.category.LAUNCHER"/>
90-
</intent-filter>
91-
</activity>
92-
93-
<activity
94-
android:name="org.qpython.qpy.main.activity.HomeMainActivity"
95-
android:launchMode="singleTask">
96-
<meta-data
97-
android:name="android.app.shortcuts"
98-
android:resource="@xml/shortcuts"/>
99-
</activity>
100-
101-
102-
<activity
103-
android:name="org.qpython.qpy.main.activity.QWebViewActivity"
104-
android:label="@string/browser">
105-
<intent-filter>
106-
<action android:name="android.intent.action.VIEW"/>
107-
108-
<category android:name="android.intent.category.DEFAULT"/>
109-
<category android:name="android.intent.category.BROWSABLE"/>
110-
111-
<data android:mimeType="text/plain"/>
112-
<data android:mimeType="image/*"/>
113-
<data
114-
android:host="course"
115-
android:path="/"
116-
android:scheme="qpython"/>
117-
</intent-filter>
116+
<data android:mimeType="text/plain"/>
117+
<data android:mimeType="image/*"/>
118+
<data
119+
android:host="course"
120+
android:path="/"
121+
android:scheme="qpython"/>
122+
</intent-filter>
118123

119-
<!-- Used to handle Chrome then menu then share.-->
124+
<!-- Used to handle Chrome then menu then share.-->
120125
<intent-filter>
121126
<action android:name="android.intent.action.SEND"/>
122127
<category android:name="android.intent.category.DEFAULT"/>

‎qpython/src/cn/java/org/qpython/qpy/texteditor/TedLocalActivity.java‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
import android.graphics.drawable.Drawable;
1010
import android.os.Bundle;
1111
import android.support.v4.app.Fragment;
12+
import android.support.v7.app.AlertDialog;
1213
import android.support.v7.app.AppCompatActivity;
14+
import android.text.InputType;
1315
import android.view.MotionEvent;
1416
import android.view.View;
1517
import android.widget.EditText;
@@ -27,6 +29,7 @@
2729
import org.qpython.qpy.main.fragment.ExplorerFragment;
2830
import org.qpython.qpy.main.fragment.LocalFragment;
2931
import org.qpython.qpy.main.fragment.MyProjectFragment;
32+
import org.qpython.qpy.texteditor.ui.view.EnterDialog;
3033
import org.qpython.qpy.utils.NotebookUtil;
3134
import org.qpython.qpysdk.QPyConstants;
3235

@@ -191,11 +194,26 @@ public void doSave(String fn) {
191194
String filename = ((ExplorerFragment) firstPageFragment).getCurPath() + "/" + fn;
192195
final File f = new File(filename);
193196
if (f.exists()) {
194-
Toast.makeText(this, R.string.file_exist_hint, Toast.LENGTH_SHORT).show();
197+
AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.MyDialog);
198+
builder.setTitle(R.string.confirm)
199+
.setMessage(R.string.editor_override)
200+
.setPositiveButton(R.string.yes, (dialog, which) -> {
201+
setSaveResult(f.getAbsolutePath());
202+
203+
})
204+
.setNegativeButton(R.string.cancel, ((dialog, which) -> nothing()))
205+
.show();
206+
207+
208+
//Toast.makeText(this, R.string.file_exist_hint, Toast.LENGTH_SHORT).show();
195209
} else {
196210
setSaveResult(f.getAbsolutePath());
197211
}
198212
}
213+
}
214+
private void nothing() {
215+
216+
199217
}
200218

201219
protected boolean setSaveResult(String filepath) {

‎qpython/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
3232
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
3333

34+
<!--uses-permission android:name="android.permission.READ_MEDIA_STORAGE"/>
35+
<uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE"/-->
36+
3437
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
3538
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
3639
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

‎qpython/src/main/res/layout/layout_editor.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
android:layout_alignParentRight="true"
4646
android:layout_margin="@dimen/default_margin"
4747
android:src="@drawable/ic_gist"
48+
android:visibility="gone"
4849
/>
4950
</RelativeLayout>
5051

‎qpython/src/main/res/values/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,4 +741,7 @@
741741
<string name="ip_address">My IP Adress</string>
742742
<string name="ip_address_need_wifi">Please connect your wifi</string>
743743

744+
745+
<string name="editor_override">Do you want to override?</string>
746+
744747
</resources>

‎qpython/src/main/res/xml/ted_prefs.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
android:title="@string/title_settings">
55

66
<PreferenceCategory android:title="@string/config_cat_display">
7-
<CheckBoxPreference
8-
android:defaultValue="true"
7+
<!--CheckBoxPreference
8+
android:defaultValue="false"
99
android:key="show_gist"
1010
android:summaryOn="@string/config_gist_icon"
11-
android:title="@string/config_title_gist"/>
11+
android:title="@string/config_title_gist"/-->
1212

1313
<CheckBoxPreference
1414
android:defaultValue="true"
@@ -52,4 +52,4 @@
5252
android:summary="@string/max_lines_num_with_syntax_summary"
5353
android:title="@string/max_lines_num_with_syntax_title"/-->
5454
</PreferenceCategory>
55-
</PreferenceScreen>
55+
</PreferenceScreen>

0 commit comments

Comments
 (0)