Fixed #33 #34, Added Commented Fix #35

materialos · Oct 5, 2015 · 1cd349c · 1cd349c
1 parent 61db57f
commit 1cd349c
Show file tree

Hide file tree

Showing 8 changed files with 627 additions and 7,083 deletions.
diff --git a/Project/MaterialOS/app/app-release.apk b/Project/MaterialOS/app/app-release.apk
diff --git a/Project/MaterialOS/app/build.gradle b/Project/MaterialOS/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "org.materialos.icons"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 6
-        versionName "1.0.0"
+        versionCode 7
+        versionName "1.0.1"
         manifestPlaceholders = [appName: "@string/app_name"]
     }
 

diff --git a/...erialOS/app/src/main/java/com/jahirfiquitiva/paperboard/fragments/WallpapersFragment.java b/...erialOS/app/src/main/java/com/jahirfiquitiva/paperboard/fragments/WallpapersFragment.java
@@ -91,11 +91,20 @@ protected Void doInBackground(Void... params) {
                         arraylist.add(map);
                     }
                 } catch (JSONException e) {
-                    Toast.makeText(getActivity(), getString(R.string.json_error_toast), Toast.LENGTH_LONG).show();
+                    //TODO: Remove Errors for JSON
+//                    runOnUiThread(new Runnable() {
+//                        public void run() {
+                            Toast.makeText(getActivity(), getString(R.string.json_error_toast), Toast.LENGTH_LONG).show();
+//                        }
+//                    });
                     e.printStackTrace();
                 }
             } else {
-                Toast.makeText(getActivity(), getString(R.string.json_error_toast), Toast.LENGTH_LONG).show();
+//                runOnUiThread(new Runnable() {
+//                    public void run() {
+                        Toast.makeText(getActivity(), getString(R.string.json_error_toast), Toast.LENGTH_LONG).show();
+//                    }
+//                });
             }
             return null;
         }

diff --git a/Project/MaterialOS/app/src/main/res/drawable-nodpi/twitch.png b/Project/MaterialOS/app/src/main/res/drawable-nodpi/twitch.png
diff --git a/Project/MaterialOS/app/src/main/res/raw/appfilter.xml b/Project/MaterialOS/app/src/main/res/raw/appfilter.xml
diff --git a/Project/MaterialOS/app/src/main/res/xml/appfilter.xml b/Project/MaterialOS/app/src/main/res/xml/appfilter.xml
@@ -670,6 +670,9 @@
     <item
         component="ComponentInfo{tv.twitch.android.app/tv.twitch.android.apps.SplashScreenActivity}"
         drawable="twitch" />
+    <item
+        component="ComponentInfo{tv.twitch.android.app/tv.twitch.android.apps.LandingActivity}"
+        drawable="twitch" />
     <!-- <item component="ComponentInfo{tv.twitch.android.viewer/tv.twitch.android.apps.SplashScreenActivity}" drawable="twitch_alt"/> -->
     <!-- <item component="ComponentInfo{tv.twitch.android.viewer/tv.twitch.android.apps.SplashScreenActivity}" drawable="twitch_alt2"/> -->
     <!-- <item component="ComponentInfo{tv.twitch.android.viewer/tv.twitch.android.apps.SplashScreenActivity}" drawable="twitter_alt"/> -->

diff --git a/Project/MaterialOS/app/src/main/res/xml/appmap.xml b/Project/MaterialOS/app/src/main/res/xml/appmap.xml
@@ -662,6 +662,9 @@
     <item
         class="tv.twitch.android.apps.SplashScreenActivity"
         name="twitch" />
+    <item
+        class="tv.twitch.android.apps.LandingActivity"
+        name="twitch" />
     <!-- <item class="tv.twitch.android.apps.SplashScreenActivity" name="twitch_alt"/> -->
     <!-- <item class="tv.twitch.android.apps.SplashScreenActivity" name="twitch_alt2"/> -->
     <!-- <item class="tv.twitch.android.apps.SplashScreenActivity" name="twitter_alt"/> -->

diff --git a/Project/MaterialOS/app/src/main/res/xml/theme_resources.xml b/Project/MaterialOS/app/src/main/res/xml/theme_resources.xml
@@ -674,6 +674,9 @@
     <AppIcon
         name="tv.twitch.android.app/tv.twitch.android.apps.SplashScreenActivity"
         image="twitch" />
+    <AppIcon
+        name="tv.twitch.android.app/tv.twitch.android.apps.LandingActivity"
+        image="twitch" />
     <!-- <AppIcon name="tv.twitch.android.viewer/tv.twitch.android.apps.SplashScreenActivity" image="twitch_alt"/> -->
     <!-- <AppIcon name="tv.twitch.android.viewer/tv.twitch.android.apps.SplashScreenActivity" image="twitch_alt2"/> -->
     <!-- <AppIcon name="tv.twitch.android.viewer/tv.twitch.android.apps.SplashScreenActivity" image="twitter_alt"/> -->