Made more whitening changes

* Changed progress popup and book titles to black on white * Made default dictionary size shorter * Added margin to dictionary rows * Added IPA font (still hooking them up)
makuto · Jun 17, 2020 · 455c65b · 455c65b
1 parent faf352e
commit 455c65b
Show file tree

Hide file tree

Showing 11 changed files with 142 additions and 16 deletions.
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/app/src/main/assets/IPA_Font_License_Agreement_v1.0.txt b/app/src/main/assets/IPA_Font_License_Agreement_v1.0.txt
diff --git a/app/src/main/assets/ipaexg.ttf b/app/src/main/assets/ipaexg.ttf
diff --git a/app/src/main/assets/ipaexm.ttf b/app/src/main/assets/ipaexm.ttf
diff --git a/app/src/main/java/net/zorgblub/typhonkai/fragment/LibraryFragment.java b/app/src/main/java/net/zorgblub/typhonkai/fragment/LibraryFragment.java
@@ -1025,7 +1025,7 @@ public View getView(final int index, final LibraryBook object, View convertView,
             image.setImageDrawable(backupCover);
             TextView text = (TextView) result.findViewById(R.id.bookLabel);
             text.setText(object.getTitle());
-            text.setBackgroundResource(R.drawable.alphabet_bar_bg_dark);
+            text.setBackgroundResource(R.drawable.alphabet_bar_bg);
 
             loadCover(image, object, index);
 

diff --git a/app/src/main/java/org/zorgblub/rikai/glosslist/DictionaryPane.java b/app/src/main/java/org/zorgblub/rikai/glosslist/DictionaryPane.java
@@ -244,7 +244,7 @@ public void onCurrentMatchChanged(SelectedWord word, Entries match) {
 
     public void showPane() {
         if (!this.isDisplaying() || this.getHeight() < 10) {
-            this.setHeight((int) (bookReader.getHeight() / 2.6));
+            this.setHeight((int) (bookReader.getHeight() / 3.2));
             this.reveal();
         }
     }

diff --git a/app/src/main/res/drawable/alphabet_bar_bg.xml b/app/src/main/res/drawable/alphabet_bar_bg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" 
   android:shape="rectangle">
-    <solid android:color="#20777777" />
+    <solid android:color="#ffffffff" />
     <corners android:radius="8dip" />
 </shape>
diff --git a/app/src/main/res/layout/bookcase_row.xml b/app/src/main/res/layout/bookcase_row.xml
@@ -19,11 +19,10 @@
         android:id="@+id/bookLabel"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:gravity="center"
         android:text="@string/small_text"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:gravity="center"
-        android:layout_gravity="bottom"  
-        android:textColor="@color/opaque_white"              
-         />
+        android:textColor="@color/opaque_black" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/definition_row.xml b/app/src/main/res/layout/definition_row.xml
@@ -24,5 +24,6 @@
 	android:id="@+id/def"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:background="#FF0000"
+	android:paddingLeft="10dp"
+	android:paddingRight="10dp"
 	android:textSize="20sp" />
diff --git a/app/src/main/res/layout/fragment_reading.xml b/app/src/main/res/layout/fragment_reading.xml
@@ -51,40 +51,40 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
-            android:background="@color/translucent_black"
+            android:background="@color/opaque_white"
             android:gravity="center"
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textColor="@color/opaque_white" />/>
+            android:textColor="@color/opaque_black" />/>
 
         <TextView
             android:id="@+id/authorField"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/myTitleBarTextView"
-            android:background="@color/translucent_black"
+            android:background="@color/opaque_white"
             android:gravity="center"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@color/opaque_white" />
+            android:textColor="@color/opaque_black" />
 
 
         <TextView
             android:id="@+id/percentageField"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/authorField"
-            android:background="@color/translucent_black"
+            android:background="@color/opaque_white"
             android:text="@string/zero_percent"
 
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@color/opaque_white" />
+            android:textColor="@color/opaque_black" />
 
         <SeekBar
             android:id="@+id/titleProgress"
             style="?android:attr/progressBarStyleHorizontal"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/percentageField"
-            android:background="@color/translucent_black"
+            android:background="@color/opaque_white"
             android:paddingLeft="16dp"
             android:paddingRight="16dp" />
     </RelativeLayout>

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -33,6 +33,8 @@
     </string-array>
 
     <string-array name="fonts">
+        <item>IPAMincho</item>
+        <item>IPAGothic</item>
         <item>mamelon</item>
         <item>boku2r</item>
         <item>kokoro</item>
@@ -46,6 +48,8 @@
     </string-array>
 
     <string-array name="fontLabels">
+        <item>IPA Mincho</item>
+        <item>IPA Gothic</item>
         <item>Mamelon Maru</item>
         <item>Boku2r Gothic</item>
         <item>Kokoro Mincho</item>
@@ -94,4 +98,4 @@
         <item>reversed</item>
     </string-array>
 
-</resources>
+</resources>