Merge pull request #142 from di72nn/testing

Experimental updates
wallabag · Nov 30, 2015 · c28b7e4 · c28b7e4
2 parents 6e874ac + 7af9c60
commit c28b7e4
Show file tree

Hide file tree

Showing 12 changed files with 479 additions and 379 deletions.
diff --git a/app/src/main/assets/dark.css b/app/src/main/assets/dark.css
@@ -28,22 +28,6 @@ body {
   font-family: serif;
 }
 
-.font-size-75 {
-  font-size: 75%;
-}
-
-.font-size-125 {
-  font-size: 125%;
-}
-
-.font-size-150 {
-  font-size: 150%;
-}
-
-.font-size-175 {
-  font-size: 175%;
-}
-
 /* ==========================================================================
    1 = Style Guide
    ========================================================================== */

diff --git a/app/src/main/assets/main.css b/app/src/main/assets/main.css
@@ -27,22 +27,6 @@ body {
   font-family: serif;
 }
 
-.font-size-75 {
-  font-size: 75%;
-}
-
-.font-size-125 {
-  font-size: 125%;
-}
-
-.font-size-150 {
-  font-size: 150%;
-}
-
-.font-size-175 {
-  font-size: 175%;
-}
-
 /* ==========================================================================
    1 = Style Guide
    ========================================================================== */

diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/data/Settings.java b/app/src/main/java/fr/gaulupeau/apps/Poche/data/Settings.java
@@ -62,16 +62,4 @@ public boolean getBoolean(String key, boolean defValue) {
         return pref.getBoolean(key, defValue);
     }
 
-    // well, that's embarrassingly blunt, but I'm too lazy to make it any better right now
-    // TODO: rewrite whole font size thing
-    public String getFontSizeCssClass() {
-        switch(getInt(FONT_SIZE, -1)) {
-            case 0: return "font-size-75";
-            case 2: return "font-size-125";
-            case 3: return "font-size-150";
-            case 4: return "font-size-175";
-            default: return null;
-        }
-    }
-
 }
diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/BaseActionBarActivity.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/BaseActionBarActivity.java
@@ -9,22 +9,22 @@
 
 public class BaseActionBarActivity extends AppCompatActivity {
 
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		addBackButtonToActionBar();
-	}
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addBackButtonToActionBar();
+    }
 
-	@TargetApi(11)
-	protected void addBackButtonToActionBar() {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-			try {
-				getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-			} catch (Exception e) {
-				//
-			}
-		}
-	}
+    @TargetApi(11)
+    protected void addBackButtonToActionBar() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+            try {
+                getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            } catch (Exception e) {
+                //
+            }
+        }
+    }
 
     @TargetApi(11)
     protected void hideBackButtonToActionBar() {
@@ -38,11 +38,11 @@ protected void hideBackButtonToActionBar() {
     }
 
     @Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		if (item.getItemId() == android.R.id.home) {
-			this.finish();
-			return true;
-		}
-		return super.onOptionsItemSelected(item);
-	}
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            this.finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
 }