Skip to content

Commit 01333a9

Browse files
imkivaimkiva
committed
feature: reset app data
1 parent c92a490 commit 01333a9

File tree

10 files changed

+59
-47
lines changed

10 files changed

+59
-47
lines changed

‎app/src/main/res/drawable-hdpi/ic_backup_restore_white_36dp.png‎

898 Bytes
Loading

‎app/src/main/res/layout/ui_about.xml‎

Lines changed: 57 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -298,51 +298,80 @@
298298
android:layout_height="wrap_content"
299299
android:layout_gravity="center"
300300
android:layout_marginBottom="8dp"
301-
android:visibility="gone"
302301
app:cardBackgroundColor="@color/list_download_item_color_dark"
303302
app:cardUseCompatPadding="true">
304303

305304
<LinearLayout
306-
android:id="@+id/about_reset_app_view"
307305
android:layout_width="fill_parent"
308306
android:layout_height="wrap_content"
309-
android:background="?android:attr/selectableItemBackground"
310-
android:clickable="true"
311-
android:focusable="true"
312-
android:gravity="center_vertical"
313-
android:minHeight="48dp"
314-
android:orientation="horizontal"
315-
android:paddingLeft="16dp"
316-
android:paddingRight="16dp">
317-
318-
<ImageView
319-
android:layout_width="24dp"
320-
android:layout_height="24dp"
321-
android:src="@drawable/ic_info" />
307+
android:layout_marginBottom="8dp"
308+
android:orientation="vertical">
322309

323310
<LinearLayout
324311
android:layout_width="fill_parent"
325-
android:layout_height="wrap_content"
326-
android:layout_marginLeft="32dp"
327-
android:layout_marginStart="32dp"
328-
android:orientation="vertical"
329-
android:paddingBottom="8dp"
330-
android:paddingTop="8dp">
312+
android:layout_height="72dp"
313+
android:orientation="horizontal"
314+
android:padding="16dp">
315+
316+
<ImageView
317+
android:layout_width="48dp"
318+
android:layout_height="48dp"
319+
android:layout_gravity="center_vertical"
320+
android:scaleType="centerCrop"
321+
android:src="@mipmap/ic_danger" />
331322

332323
<TextView
333324
android:layout_width="wrap_content"
334325
android:layout_height="wrap_content"
335-
android:text="@string/about_reset_label"
336-
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
326+
android:layout_gravity="center_vertical"
327+
android:paddingLeft="16dp"
328+
android:paddingRight="16dp"
329+
android:text="@string/app_name"
330+
android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
331+
</LinearLayout>
337332

338-
<TextView
339-
android:layout_width="wrap_content"
333+
<LinearLayout
334+
android:id="@+id/about_reset_app_view"
335+
android:layout_width="fill_parent"
336+
android:layout_height="wrap_content"
337+
android:background="?android:attr/selectableItemBackground"
338+
android:clickable="true"
339+
android:focusable="true"
340+
android:gravity="center_vertical"
341+
android:minHeight="48dp"
342+
android:orientation="horizontal"
343+
android:paddingLeft="16dp"
344+
android:paddingRight="16dp">
345+
346+
<ImageView
347+
android:layout_width="24dp"
348+
android:layout_height="24dp"
349+
android:src="@drawable/ic_info" />
350+
351+
<LinearLayout
352+
android:layout_width="fill_parent"
340353
android:layout_height="wrap_content"
341-
android:text="@string/about_reset_label_desc"
342-
android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
354+
android:layout_marginLeft="32dp"
355+
android:layout_marginStart="32dp"
356+
android:orientation="vertical"
357+
android:paddingBottom="8dp"
358+
android:paddingTop="8dp">
343359

344-
</LinearLayout>
360+
<TextView
361+
android:layout_width="wrap_content"
362+
android:layout_height="wrap_content"
363+
android:text="@string/about_reset_label"
364+
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
365+
366+
<TextView
367+
android:layout_width="wrap_content"
368+
android:layout_height="wrap_content"
369+
android:text="@string/about_reset_label_desc"
370+
android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
345371

372+
</LinearLayout>
373+
374+
</LinearLayout>
346375
</LinearLayout>
347376

348377
</android.support.v7.widget.CardView>

‎app/src/main/res/mipmap-hdpi/ic_danger.png‎

1.91 KB
Loading

‎app/src/main/res/mipmap-xhdpi/ic_danger.png‎

1.37 KB
Loading

‎app/src/main/res/mipmap-xxhdpi/ic_danger.png‎

2.17 KB
Loading

‎app/src/main/res/mipmap-xxxhdpi/ic_danger.png‎

5.26 KB
Loading

‎app/src/main/res/mipmap-xxxhdpi/ic_launcher_neoterm.png‎

-13.3 KB
Binary file not shown.

‎app/src/main/res/values-zh-rCN/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@
162162
<string name="error_new_source_url">URL 不能为空</string>
163163
<string name="error_new_source_repo">仓库 不能为空</string>
164164
<string name="sorry_for_development">本功能仍在开发中，所以只能在 DEBUG 构建版本下使用。\n若想尝鲜，请尝试联系开发者来成为测试者。</string>
165+
<string name="dangerous_zone">危险区域</string>
165166

166167
<string-array name="color_item_names">
167168
<item>背景色</item>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@
166166
<string name="error_new_source_url">URL cannot be empty</string>
167167
<string name="error_new_source_repo">Repo cannot be empty</string>
168168
<string name="sorry_for_development">This feature is still under development so it is only available on DEBUG builds.\n</string>
169+
<string name="dangerous_zone">Dangerous Zone</string>
169170

170171
<string name="default_source_url">http://193.112.47.241</string>
171172

‎app/src/main/res/xml/settings_main.xml‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,6 @@
3737
android:targetPackage="io.neoterm" />
3838
</Preference>
3939

40-
<!--
41-
<Preference
42-
android:icon="@drawable/ic_guide_white_36dp"
43-
android:key="@string/discovery"
44-
android:title="@string/discovery">
45-
<intent
46-
android:targetClass="io.neotermshowConfirmDialogetup.SetupActivity"
47-
android:targetPackage="io.neoterm" />
48-
</Preference>
49-
-->
50-
51-
<!--<Preference-->
52-
<!--android:icon="@drawable/ic_info_white_36dp"-->
53-
<!--android:title="@string/faq" >-->
54-
<!--<intent-->
55-
<!--android:targetClass="io.neoterm.ui.support.HelpActivity"-->
56-
<!--android:targetPackage="io.neoterm" />-->
57-
<!--</Preference>-->
58-
5940
<Preference
6041
android:icon="@drawable/ic_info_white_36dp"
6142
android:title="@string/about" >

0 commit comments

Comments
 (0)