Skip to content

Commit

Permalink
Huge core and UI update
Browse files Browse the repository at this point in the history
  • Loading branch information
andrew-boyarshin authored and zhuowei committed Mar 30, 2014
1 parent 46af52f commit f3e4e79
Show file tree
Hide file tree
Showing 100 changed files with 4,249 additions and 2,078 deletions.
4 changes: 2 additions & 2 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name" >
<activity
android:name="net.zhuoweizhang.mcpelauncher.LauncherActivity"
android:name="net.zhuoweizhang.mcpelauncher.ui.LauncherActivity"
android:configChanges="orientation|keyboardHidden"
android:screenOrientation="landscape"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
Expand All @@ -24,7 +24,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="net.zhuoweizhang.mcpelauncher.MainMenuOptionsActivity" />
<activity android:name="net.zhuoweizhang.mcpelauncher.ui.MainMenuOptionsActivity" />
</application>

</manifest>
10 changes: 0 additions & 10 deletions local.properties

This file was deleted.

2 changes: 1 addition & 1 deletion project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-10
target=android-19

android.library=true

Expand Down
Binary file added res/drawable-hdpi/switch_bg_disabled_holo_dark.9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/switch_bg_focused_holo_dark.9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/switch_bg_focused_holo_light.9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/switch_bg_holo_dark.9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/switch_bg_holo_light.9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/switch_thumb_holo_dark.9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/switch_thumb_holo_light.9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-ldpi/switch_bg_disabled_holo_dark.9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-ldpi/switch_bg_focused_holo_dark.9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-ldpi/switch_bg_focused_holo_light.9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-ldpi/switch_bg_holo_dark.9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-ldpi/switch_bg_holo_light.9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-ldpi/switch_thumb_holo_dark.9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-ldpi/switch_thumb_holo_light.9.png
Binary file added res/drawable-xhdpi/switch_bg_focused_holo_dark.9.png
Binary file added res/drawable-xhdpi/switch_bg_holo_dark.9.png
Binary file added res/drawable-xhdpi/switch_bg_holo_light.9.png
Binary file added res/drawable-xhdpi/switch_thumb_holo_dark.9.png
Binary file added res/drawable-xhdpi/switch_thumb_holo_light.9.png
22 changes: 22 additions & 0 deletions res/drawable/switch_inner_holo_dark.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:drawable="@drawable/switch_thumb_disabled_holo_dark" />
<item android:state_pressed="true" android:drawable="@drawable/switch_thumb_pressed_holo_dark" />
<item android:state_checked="true" android:drawable="@drawable/switch_thumb_activated_holo_dark" />
<item android:drawable="@drawable/switch_thumb_holo_dark" />
</selector>
22 changes: 22 additions & 0 deletions res/drawable/switch_inner_holo_light.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:drawable="@drawable/switch_thumb_disabled_holo_light" />
<item android:state_pressed="true" android:drawable="@drawable/switch_thumb_pressed_holo_light" />
<item android:state_checked="true" android:drawable="@drawable/switch_thumb_activated_holo_light" />
<item android:drawable="@drawable/switch_thumb_holo_light" />
</selector>
20 changes: 20 additions & 0 deletions res/drawable/switch_track_holo_dark.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:drawable="@drawable/switch_bg_focused_holo_dark" />
<item android:drawable="@drawable/switch_bg_holo_dark" />
</selector>
20 changes: 20 additions & 0 deletions res/drawable/switch_track_holo_light.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:drawable="@drawable/switch_bg_focused_holo_light" />
<item android:drawable="@drawable/switch_bg_holo_light" />
</selector>
16 changes: 16 additions & 0 deletions res/layout-v14/ab_master_switch.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal" >

<Switch
android:id="@+id/ab_switch"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:clickable="true"
android:focusable="false"
android:gravity="center" />

</RelativeLayout>
17 changes: 17 additions & 0 deletions res/layout/ab_master_switch.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal" >

<de.ankri.views.Switch
android:id="@+id/ab_switch"
style="@style/switch_dark"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:clickable="true"
android:focusable="false"
android:gravity="center" />

</RelativeLayout>
38 changes: 38 additions & 0 deletions res/layout/manage_skins.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".ui.ManageTexturepacksActivity" >

<ListView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1" />

<LinearLayout
style="@style/ButtonBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >

<Button
android:id="@+id/manage_skins_players"
style="@style/ButtonBar.Button"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/pref_zz_skin_download_source" />

<Button
android:id="@+id/manage_skins_select"
style="@style/ButtonBar.Button"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/textures_select" />
</LinearLayout>

</LinearLayout>
37 changes: 37 additions & 0 deletions res/layout/manage_textures.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".ui.ManageTexturepacksActivity" >

<ListView
android:id="@android:id/list"
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="match_parent" />

<LinearLayout
style="@style/ButtonBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<Button
android:id="@+id/manage_textures_extract"
style="@style/ButtonBar.Button"
android:layout_weight="1"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:text="@string/textures_extract" />

<Button
android:id="@+id/manage_textures_select"
style="@style/ButtonBar.Button"
android:layout_weight="1"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:text="@string/textures_select" />
</LinearLayout>

</LinearLayout>
31 changes: 0 additions & 31 deletions res/layout/preference_seek_bar_dialog.xml

This file was deleted.

43 changes: 43 additions & 0 deletions res/layout/switch_preference.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingRight="?android:attr/scrollbarSize" >

<RelativeLayout
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1" >

<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium" />

<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:ellipsize="end"
android:maxLines="2"
android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>

<de.ankri.views.Switch
android:id="@+id/switch_widget"
style="@style/switch_dark"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:clickable="true"
android:focusable="false"
android:gravity="center" />

</LinearLayout>
11 changes: 11 additions & 0 deletions res/menu/ab_master.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">

<item
android:id="@+id/ab_switch_container"
android:actionLayout="@layout/ab_master_switch"
android:showAsAction="always"
android:title="Toggle state"
tools:ignore="HardcodedText"/>

</menu>
11 changes: 11 additions & 0 deletions res/values-v11/style.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="ButtonBar" parent="@android:style/Holo.ButtonBar">

</style>
<style name="ButtonBar.Button" parent="@android:style/Widget.Holo.Button.Borderless">

</style>

</resources>
39 changes: 30 additions & 9 deletions res/values/attrs.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,31 @@
<resources>

<!-- note: to re-use an existing Android attribute not already used by the superclass, name should have prefix "android:" and do not define a format -->
<declare-styleable name="SeekBarDialogPreference">
<attr name="android:max" />
<attr name="min" format="integer" />
<attr name="progressTextSuffix" format="string" />
</declare-styleable>

<?xml version="1.0" encoding="utf-8"?>
<resources>

<attr name="switchStyle" format="reference" />

<declare-styleable name="Switch">
<attr name="thumb" format="reference" />
<attr name="track" format="reference" />
<attr name="textOn" format="string" />
<attr name="textOff" format="string" />
<attr name="thumbTextPadding" format="dimension" />
<attr name="switchTextAppearance" format="reference" />
<attr name="switchMinWidth" format="dimension" />
<attr name="switchPadding" format="dimension" />
</declare-styleable>

<attr name="textAppearance" format="reference" />

<declare-styleable name="TextAppearanceSwitch">
<attr name="textColor" format="color" />
<attr name="textSize" format="dimension" />
<attr name="textStyle" format="reference" />
<attr name="typeface" format="reference" />
<attr name="fontFamily" format="reference" />
<attr name="textColorHighlight" format="color" />
<attr name="textColorHint" format="color" />
<attr name="textColorLink" format="color" />
<attr name="textAllCaps" format="boolean" />
</declare-styleable>

</resources>
Loading

0 comments on commit f3e4e79

Please sign in to comment.