Skip to content

Commit 0cd9c9b

Browse files
kb-1000kb-1000
committed
Restyle XML files
1 parent ef5ebb7 commit 0cd9c9b

29 files changed

+101
-142
lines changed

‎.idea/codeStyles/Project.xml‎

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/AndroidManifest.xml‎

Lines changed: 30 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,55 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="com.fake.android.torchlight"
5-
android:installLocation="auto">
3+
xmlns:tools="http://schemas.android.com/tools"
4+
package="com.fake.android.torchlight"
5+
android:installLocation="auto">
66

7-
<uses-feature
8-
android:name="android.hardware.camera"
9-
android:required="false"/>
10-
<uses-feature
11-
android:name="android.hardware.camera.flash"
12-
android:required="false"/>
7+
<uses-feature android:name="android.hardware.camera" android:required="false" />
8+
<uses-feature android:name="android.hardware.camera.flash" android:required="false" />
139

14-
<uses-permission android:name="android.permission.CAMERA"/>
15-
<uses-permission android:name="android.permission.FLASHLIGHT"/>
10+
<uses-permission android:name="android.permission.CAMERA" />
11+
<uses-permission android:name="android.permission.FLASHLIGHT" />
1612

1713
<!-- <uses-permission android:name="android.permission.INTERNET" /> -->
18-
<application
19-
android:allowBackup="false"
20-
android:icon="@mipmap/ic_launcher"
21-
android:roundIcon="@mipmap/ic_launcher_round"
14+
<application android:allowBackup="false"
15+
android:icon="@mipmap/ic_launcher"
16+
android:roundIcon="@mipmap/ic_launcher_round"
17+
android:label="@string/app_name"
18+
android:supportsRtl="true"
19+
android:theme="@style/AppTheme"
20+
tools:ignore="GoogleAppIndexingWarning">
21+
<activity android:name=".MainActivity"
2222
android:label="@string/app_name"
23-
android:supportsRtl="true"
24-
android:theme="@style/AppTheme"
25-
tools:ignore="GoogleAppIndexingWarning">
26-
<activity
27-
android:name=".MainActivity"
28-
android:label="@string/app_name"
29-
android:theme="@style/AppTheme.NoActionBar">
23+
android:theme="@style/AppTheme.NoActionBar">
3024
<intent-filter>
31-
<action android:name="android.intent.action.MAIN"/>
25+
<action android:name="android.intent.action.MAIN" />
3226

33-
<category android:name="android.intent.category.LAUNCHER"/>
27+
<category android:name="android.intent.category.LAUNCHER" />
3428
</intent-filter>
3529
</activity>
36-
<activity
37-
android:name=".FlashActivity"
38-
android:theme="@style/AppTheme.Torch"/>
39-
<activity
40-
android:name=".AutoFlashActivity"
41-
android:label="@string/auto_flash">
30+
<activity android:name=".FlashActivity" android:theme="@style/AppTheme.Torch" />
31+
<activity android:name=".AutoFlashActivity" android:label="@string/auto_flash">
4232
<intent-filter>
43-
<action android:name="android.intent.action.MAIN"/>
33+
<action android:name="android.intent.action.MAIN" />
4434

45-
<category android:name="android.intent.category.DEFAULT"/>
35+
<category android:name="android.intent.category.DEFAULT" />
4636
</intent-filter>
4737
</activity>
4838

49-
<receiver
50-
android:name=".ToggleReceiver"
51-
android:enabled="true"/>
39+
<receiver android:name=".ToggleReceiver" android:enabled="true" />
5240
<receiver android:name=".TorchlightWidget">
5341
<intent-filter>
54-
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
42+
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
5543
</intent-filter>
5644

57-
<meta-data
58-
android:name="android.appwidget.provider"
59-
android:resource="@xml/torchlight_widget_info"/>
45+
<meta-data android:name="android.appwidget.provider" android:resource="@xml/torchlight_widget_info" />
6046
</receiver>
6147

62-
<activity
63-
android:name=".SettingsActivity"
64-
android:label="@string/action_settings"
65-
android:parentActivityName=".MainActivity">
66-
<meta-data
67-
android:name="android.support.PARENT_ACTIVITY"
68-
android:value="com.fake.android.torchlight.MainActivity"/>
48+
<activity android:name=".SettingsActivity"
49+
android:label="@string/action_settings"
50+
android:parentActivityName=".MainActivity">
51+
<meta-data android:name="android.support.PARENT_ACTIVITY"
52+
android:value="com.fake.android.torchlight.MainActivity" />
6953
</activity>
7054
</application>
7155

‎app/src/main/java/com/fake/android/torchlight/MainActivity.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
136136
// as you specify a parent activity in AndroidManifest.xml.
137137
int id = item.getItemId();
138138

139-
//noinspection SimplifiableIfStatement
140139
if (id == R.id.action_settings) {
141140
Intent intent = new Intent(MainActivity.this, SettingsActivity.class);
142141
startActivity(intent);

‎app/src/main/res/drawable-v21/ic_menu_manage.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
android:height="24dp"
44
android:viewportHeight="24.0"
55
android:viewportWidth="24.0">
6-
<path
7-
android:fillColor="#FF000000"
6+
<path android:fillColor="#FF000000"
87
android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z" />
9-
</vector>
8+
</vector>

‎app/src/main/res/drawable-v21/ic_menu_send.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@
33
android:height="24dp"
44
android:viewportHeight="24.0"
55
android:viewportWidth="24.0">
6-
<path
7-
android:fillColor="#FF000000"
8-
android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
6+
<path android:fillColor="#FF000000" android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
97
</vector>

‎app/src/main/res/drawable-v21/ic_menu_share.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
android:height="24dp"
44
android:viewportHeight="24.0"
55
android:viewportWidth="24.0">
6-
<path
7-
android:fillColor="#FF000000"
6+
<path android:fillColor="#FF000000"
87
android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
98
</vector>

‎app/src/main/res/drawable/ic_info_black_24dp.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
android:height="24dp"
44
android:viewportHeight="24.0"
55
android:viewportWidth="24.0">
6-
<path
7-
android:fillColor="#FF000000"
6+
<path android:fillColor="#FF000000"
87
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm1,15h-2v-6h2v6zm0,-8h-2V7h2v2z" />
98
</vector>

‎app/src/main/res/drawable/ic_launcher_background.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@
44
android:height="108dp"
55
android:viewportHeight="108"
66
android:viewportWidth="108">
7-
<path
8-
android:fillColor="#26A69A"
9-
android:pathData="M0,0h108v108h-108z" />
7+
<path android:fillColor="#26A69A" android:pathData="M0,0h108v108h-108z" />
108
</vector>

‎app/src/main/res/drawable/ic_sunny_black.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
android:height="250dp"
44
android:viewportHeight="24.0"
55
android:viewportWidth="24.0">
6-
<path
7-
android:fillColor="#FF000000"
6+
<path android:fillColor="#FF000000"
87
android:pathData="M6.76,4.84l-1.8,-1.79 -1.41,1.41 1.79,1.79 1.42,-1.41zM4,10.5L1,10.5v2h3v-2zM13,0.55h-2L11,3.5h2L13,0.55zM20.45,4.46l-1.41,-1.41 -1.79,1.79 1.41,1.41 1.79,-1.79zM17.24,18.16l1.79,1.8 1.41,-1.41 -1.8,-1.79 -1.4,1.4zM20,10.5v2h3v-2h-3zM12,5.5c-3.31,0 -6,2.69 -6,6s2.69,6 6,6 6,-2.69 6,-6 -2.69,-6 -6,-6zM11,22.45h2L13,19.5h-2v2.95zM3.55,18.54l1.41,1.41 1.79,-1.8 -1.41,-1.41 -1.79,1.8z" />
98
</vector>

‎app/src/main/res/drawable/ic_sunny_white.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
android:height="250dp"
44
android:viewportHeight="24.0"
55
android:viewportWidth="24.0">
6-
<path
7-
android:fillColor="#FFFFFFFF"
6+
<path android:fillColor="#FFFFFFFF"
87
android:pathData="M6.76,4.84l-1.8,-1.79 -1.41,1.41 1.79,1.79 1.42,-1.41zM4,10.5L1,10.5v2h3v-2zM13,0.55h-2L11,3.5h2L13,0.55zM20.45,4.46l-1.41,-1.41 -1.79,1.79 1.41,1.41 1.79,-1.79zM17.24,18.16l1.79,1.8 1.41,-1.41 -1.8,-1.79 -1.4,1.4zM20,10.5v2h3v-2h-3zM12,5.5c-3.31,0 -6,2.69 -6,6s2.69,6 6,6 6,-2.69 6,-6 -2.69,-6 -6,-6zM11,22.45h2L13,19.5h-2v2.95zM3.55,18.54l1.41,1.41 1.79,-1.8 -1.41,-1.41 -1.79,1.8z" />
98
</vector>

0 commit comments

Comments
 (0)