galaxy 9 support - rounded corners

Author: plotn

android/res/layout/option_value.xml

@@ -38,6 +38,8 @@
       android:layout_centerVertical="true"
     />
     <ImageView android:id="@+id/btn_option_add_info"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginRight="2dip"
         android:layout_marginLeft="2dip"
         android:layout_gravity="center_vertical|right"

android/res/values-ru/strings.xml

@@ -92,6 +92,7 @@
     <string name="options_page_margin_right">Правый отступ</string>
     <string name="options_page_margin_top">Верхний отступ</string>
     <string name="options_page_margin_bottom">Нижний отступ</string>
+    <string name="options_rounded_corners_margin">Отступы в заголовке (для скругленных краев)</string>
     <string name="options_view_mode">Режим просмотра</string>
     <string name="options_view_mode_pages">Страницы</string>
     <string name="options_view_mode_scroll">Свиток</string>

android/res/values/strings.xml

@@ -97,6 +97,7 @@
     <string name="options_page_margin_right">Right margin</string>
     <string name="options_page_margin_top">Top margin</string>
     <string name="options_page_margin_bottom">Bottom margin</string>
+    <string name="options_rounded_corners_margin">Header margins (for rounded corners)</string>
     <string name="options_view_mode">View mode</string>
     <string name="options_view_mode_pages">Pages</string>
     <string name="options_view_mode_scroll">Scroll</string>

android/src/org/coolreader/crengine/BaseActivity.java

@@ -1956,6 +1956,8 @@ public Properties loadSettings(BaseActivity activity, File file) {
 			props.applyDefault(ReaderView.PROP_PAGE_MARGIN_RIGHT, hmargin);
 			props.applyDefault(ReaderView.PROP_PAGE_MARGIN_TOP, vmargin);
 			props.applyDefault(ReaderView.PROP_PAGE_MARGIN_BOTTOM, vmargin);
+
+			props.applyDefault(ReaderView.PROP_ROUNDED_CORNERS_MARGIN, "0");
 
 	        props.applyDefault(ReaderView.PROP_APP_SCREEN_UPDATE_MODE, "0");
 	        props.applyDefault(ReaderView.PROP_APP_SCREEN_UPDATE_INTERVAL, "10");

android/src/org/coolreader/crengine/OptionsDialog.java

@@ -139,6 +139,9 @@ public static int findBacklightSettingIndex( int value ) {
 	int[] mMargins = new int[] {
 			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 20, 25, 30, 40, 50, 60, 80, 100, 130, 150, 200, 300
 		};
+	int[] mRoundedCornersMargins = new int[] {
+			0, 5, 10, 15, 20, 30, 40, 50, 60, 70,80, 90, 100, 120, 140, 160
+	};
 	double[] mGammas = new double[] {
 			0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2, 1.3, 1.5, 1.9
 		};
@@ -3184,7 +3187,12 @@ private void setupReaderOptions()
 		mOptionsPage.add(new ListOption(this, getString(R.string.options_page_margin_right), PROP_PAGE_MARGIN_RIGHT, getString(R.string.option_add_info_empty_text)).add(mMargins).setDefaultValue("5").setIconIdByAttr(R.attr.cr3_option_text_margin_right_drawable, R.drawable.cr3_option_text_margin_right));
 		mOptionsPage.add(new ListOption(this, getString(R.string.options_page_margin_top), PROP_PAGE_MARGIN_TOP, getString(R.string.option_add_info_empty_text)).add(mMargins).setDefaultValue("5").setIconIdByAttr(R.attr.cr3_option_text_margin_top_drawable, R.drawable.cr3_option_text_margin_top));
 		mOptionsPage.add(new ListOption(this, getString(R.string.options_page_margin_bottom), PROP_PAGE_MARGIN_BOTTOM, getString(R.string.option_add_info_empty_text)).add(mMargins).setDefaultValue("5").setIconIdByAttr(R.attr.cr3_option_text_margin_bottom_drawable, R.drawable.cr3_option_text_margin_bottom));
-		
+		mOptionsPage.add(new ListOption(this, getString(R.string.options_rounded_corners_margin), PROP_ROUNDED_CORNERS_MARGIN,
+				getString(R.string.option_add_info_empty_text)).add(mRoundedCornersMargins).setDefaultValue("0"))
+				//.
+				//setIconIdByAttr(R.attr.cr3_option_text_margin_right_drawable, R.drawable.cr3_option_text_margin_right))
+		;
+
 		mOptionsControls = new OptionsListView(getContext());
 		mOptionsControls.add(new KeyMapOption(this, getString(R.string.options_app_key_actions), getString(R.string.option_add_info_empty_text)).setIconIdByAttr(R.attr.cr3_option_controls_keys_drawable, R.drawable.cr3_option_controls_keys));
 		mOptionsControls.add(new TapZoneOption(this, getString(R.string.options_app_tapzones_normal), PROP_APP_TAP_ZONE_ACTIONS_TAP, getString(R.string.option_add_info_empty_text)).setIconIdByAttr(R.attr.cr3_option_controls_tapzones_drawable, R.drawable.cr3_option_controls_tapzones));

android/src/org/coolreader/crengine/Settings.java

@@ -41,6 +41,8 @@ public interface Settings {
     public static final String PROP_PAGE_MARGIN_BOTTOM      ="crengine.page.margin.bottom";
     public static final String PROP_PAGE_MARGIN_LEFT        ="crengine.page.margin.left";
     public static final String PROP_PAGE_MARGIN_RIGHT       ="crengine.page.margin.right";
+    public static final String PROP_ROUNDED_CORNERS_MARGIN  = "crengine.rounded.corners.margin";
+
     public static final String PROP_PAGE_VIEW_MODE          ="crengine.page.view.mode"; // pages/scroll
     public static final String PROP_PAGE_ANIMATION          ="crengine.page.animation";
     public static final String PROP_INTERLINE_SPACE         ="crengine.interline.space";